From b24f021579c5384ea9ba22decec84e757d5fbd09 Mon Sep 17 00:00:00 2001 From: Sakari Ailus Date: Mon, 14 Aug 2017 06:15:21 -0400 Subject: 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: 4ee236219f6d ("media: v4l2-fwnode: suppress a warning at OF parsing logic") Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab --- drivers/media/v4l2-core/v4l2-fwnode.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'drivers') diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c index 5cd2687310fe..3f8eed008700 100644 --- a/drivers/media/v4l2-core/v4l2-fwnode.c +++ b/drivers/media/v4l2-core/v4l2-fwnode.c @@ -65,19 +65,23 @@ 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 */) { + if (rval != 1 + bus->num_data_lanes /* clock+data */) { pr_warn("invalid number of lane-polarities entries (need %u, got %u)\n", 1 + bus->num_data_lanes, rval); 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)) { -- cgit v1.2.3