diff options
| author | Sakari Ailus | 2019-05-03 12:39:41 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2019-05-23 16:18:18 +0200 |
| commit | f8075c1cdc79002a0a8ce141c0c2e8c627a46c66 (patch) | |
| tree | f3ba4ec1e20f91d70096d8a42af2a07107a3406b /drivers/media/v4l2-core | |
| parent | media: ov7740: remove redundant V4L2_CTRL_FLAG_VOLATILE set (diff) | |
| download | kernel-qcow2-linux-f8075c1cdc79002a0a8ce141c0c2e8c627a46c66.tar.gz kernel-qcow2-linux-f8075c1cdc79002a0a8ce141c0c2e8c627a46c66.tar.xz kernel-qcow2-linux-f8075c1cdc79002a0a8ce141c0c2e8c627a46c66.zip | |
media: v4l: fwnode: C-PHY has no clock lane
C-PHY doesn't use a clock lane, hence the test for the clock lane when
there isn't one is faulty. Rework the test for the conflicting clock lane.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/v4l2-core')
| -rw-r--r-- | drivers/media/v4l2-core/v4l2-fwnode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c index ea1ed88f9dc8..dea8917fd912 100644 --- a/drivers/media/v4l2-core/v4l2-fwnode.c +++ b/drivers/media/v4l2-core/v4l2-fwnode.c @@ -212,10 +212,10 @@ static int v4l2_fwnode_endpoint_parse_csi2_bus(struct fwnode_handle *fwnode, have_clk_lane = true; } - if (lanes_used & BIT(clock_lane)) { - if (have_clk_lane || !use_default_lane_mapping) - pr_warn("duplicated lane %u in clock-lanes, using defaults\n", - v); + if (have_clk_lane && lanes_used & BIT(clock_lane) && + !use_default_lane_mapping) { + pr_warn("duplicated lane %u in clock-lanes, using defaults\n", + v); use_default_lane_mapping = true; } |