diff options
| author | Tomasz Gorochowik <tgorochowik@antmicro.com> | 2018-05-21 14:54:50 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2018-10-11 19:40:24 +0200 |
| commit | 96735aacb23ef53c7b55c2afacf13e84d0cc19c4 (patch) | |
| tree | 4c9c076cdc13a4644679e0b69b868bf9bf3b55b6 | |
| parent | 694d628e20fc3121f52b6a41038e4eb4cc8bc712 (diff) | |
imx8: csi: Fix off-by-one error in sensors enumeration
Sensor ID counter starts from 0 while the actual device number starts
from 1. Fix the issue that it caused.
Without this fix it is impossible to make proper media pads connections.
(cherry picked from commit 3c2f4472dacdf4b28dbab262fd46e24a13cc58ca)
Conflicts:
drivers/media/platform/imx8/mxc-media-dev.c
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
(cherry picked from commit d510d569e1f716c2d6b161e5dee183bb900b04eb)
| -rw-r--r-- | drivers/media/platform/imx8/mxc-media-dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/imx8/mxc-media-dev.c b/drivers/media/platform/imx8/mxc-media-dev.c index ff20a9b8e520..748e629fd4d1 100644 --- a/drivers/media/platform/imx8/mxc-media-dev.c +++ b/drivers/media/platform/imx8/mxc-media-dev.c @@ -235,7 +235,7 @@ static int mxc_md_create_links(struct mxc_md *mxc_md) v4l2_info(&mxc_md->v4l2_dev, "created link [%s] => [%s]\n", sensor->sd->entity.name, pcsidev->sd.entity.name); } else if (mxc_md->mipi_csi2) { - mipi_csi2 = mxc_md->mipi_csi2[sensor->id]; + mipi_csi2 = mxc_md->mipi_csi2[sensor->id + 1]; if (mipi_csi2 == NULL) continue; source = &sensor->sd->entity; @@ -443,7 +443,7 @@ static int register_mipi_csi2_entity(struct mxc_md *mxc_md, sd->grp_id = GRP_ID_MXC_MIPI_CSI2; ret = v4l2_device_register_subdev(&mxc_md->v4l2_dev, sd); if (!ret) - mxc_md->mipi_csi2[mipi_csi2->id] = mipi_csi2; + mxc_md->mipi_csi2[mipi_csi2->id +1] = mipi_csi2; else v4l2_err(&mxc_md->v4l2_dev, "Failed to register MIPI-CSIS.%d (%d)\n", mipi_csi2->id, ret); |