Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b24f0215 authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

media: v4l: fwnode: Fix lane-polarities property parsing 



fwnode_property_read_u32_array() only returns the number of array elements
if the array argument is NULL. The assumption that it always did so lead to
lane-polarities properties never being read.

Fixes: 4ee23621 ("media: v4l2-fwnode: suppress a warning at OF parsing logic")

Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent f758eb23

drivers/media/v4l2-core/v4l2-fwnode.c

+7 −3
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ static int v4l2_fwnode_endpoint_parse_csi2_bus(struct fwnode_handle *fwnode, 
		}



		rval = fwnode_property_read_u32_array(fwnode,

						      "lane-polarities", array,

						      1 + bus->num_data_lanes);

						      "lane-polarities", NULL,

						      0);

		if (rval > 0) {

			if (rval != 1 + bus->num_data_lanes /* clock+data */) {

				pr_warn("invalid number of lane-polarities entries (need %u, got %u)\n",
@@ -74,10 +74,14 @@ static int v4l2_fwnode_endpoint_parse_csi2_bus(struct fwnode_handle *fwnode, 
				return -EINVAL;

			}



			fwnode_property_read_u32_array(fwnode,

						       "lane-polarities", array,

						       1 + bus->num_data_lanes);



			for (i = 0; i < 1 + bus->num_data_lanes; i++)

				bus->lane_polarities[i] = array[i];

		}



	}



	if (!fwnode_property_read_u32(fwnode, "clock-lanes", &v)) {