media: v4l: fwnode: Fix lane-polarities property parsing
authorSakari Ailus <sakari.ailus@linux.intel.com>
Mon, 14 Aug 2017 10:15:21 +0000 (06:15 -0400)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Sat, 26 Aug 2017 17:45:35 +0000 (13:45 -0400)
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 <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/v4l2-core/v4l2-fwnode.c

index 5cd2687310fee39255b5efc56d3e2c6ea38ed856..3f8eed008700f817fb879c5d62e8033e8cfd7a44 100644 (file)
@@ -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)) {