summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@linux.intel.com>2017-08-14 06:22:14 -0400
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-08-26 13:51:57 -0400
commit1526c704b3c32640b5e6cdc1662b0698603e9d4f (patch)
tree27702798027d35c301dc4239d4eacb44559e8e29
parentb24f021579c5384ea9ba22decec84e757d5fbd09 (diff)
media: v4l: fwnode: The clock lane is the first lane in lane_polarities
The clock lane is the first lane in the lane_polarities array. Reflect this consistently by putting the number of data lanes after the number of clock lanes. 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>
-rw-r--r--drivers/media/v4l2-core/v4l2-fwnode.c2
-rw-r--r--include/media/v4l2-fwnode.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
index 3f8eed008700..df7169b5ed8c 100644
--- a/drivers/media/v4l2-core/v4l2-fwnode.c
+++ b/drivers/media/v4l2-core/v4l2-fwnode.c
@@ -48,7 +48,7 @@ static int v4l2_fwnode_endpoint_parse_csi2_bus(struct fwnode_handle *fwnode,
rval = fwnode_property_read_u32_array(fwnode, "data-lanes", NULL, 0);
if (rval > 0) {
- u32 array[MAX_DATA_LANES + 1];
+ u32 array[1 + MAX_DATA_LANES];
bus->num_data_lanes = min_t(int, MAX_DATA_LANES, rval);
diff --git a/include/media/v4l2-fwnode.h b/include/media/v4l2-fwnode.h
index cb34dcb0bb65..08e743fb7944 100644
--- a/include/media/v4l2-fwnode.h
+++ b/include/media/v4l2-fwnode.h
@@ -42,7 +42,7 @@ struct v4l2_fwnode_bus_mipi_csi2 {
unsigned char data_lanes[MAX_DATA_LANES];
unsigned char clock_lane;
unsigned short num_data_lanes;
- bool lane_polarities[MAX_DATA_LANES + 1];
+ bool lane_polarities[1 + MAX_DATA_LANES];
};
/**