| From f5c287fb93318ca71b92ed8f195e32b18f9be606 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 7 Aug 2019 11:19:00 -0300 |
| Subject: media: omap3isp: Set device on omap3isp subdevs |
| |
| From: Sakari Ailus <sakari.ailus@linux.intel.com> |
| |
| [ Upstream commit e9eb103f027725053a4b02f93d7f2858b56747ce ] |
| |
| The omap3isp driver registered subdevs without the dev field being set. Do |
| that now. |
| |
| Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> |
| Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/media/platform/omap3isp/ispccdc.c | 1 + |
| drivers/media/platform/omap3isp/ispccp2.c | 1 + |
| drivers/media/platform/omap3isp/ispcsi2.c | 1 + |
| drivers/media/platform/omap3isp/isppreview.c | 1 + |
| drivers/media/platform/omap3isp/ispresizer.c | 1 + |
| drivers/media/platform/omap3isp/ispstat.c | 2 ++ |
| 6 files changed, 7 insertions(+) |
| |
| diff --git a/drivers/media/platform/omap3isp/ispccdc.c b/drivers/media/platform/omap3isp/ispccdc.c |
| index 882310eb45ccf..fe16fbd95221f 100644 |
| --- a/drivers/media/platform/omap3isp/ispccdc.c |
| +++ b/drivers/media/platform/omap3isp/ispccdc.c |
| @@ -2608,6 +2608,7 @@ int omap3isp_ccdc_register_entities(struct isp_ccdc_device *ccdc, |
| int ret; |
| |
| /* Register the subdev and video node. */ |
| + ccdc->subdev.dev = vdev->mdev->dev; |
| ret = v4l2_device_register_subdev(vdev, &ccdc->subdev); |
| if (ret < 0) |
| goto error; |
| diff --git a/drivers/media/platform/omap3isp/ispccp2.c b/drivers/media/platform/omap3isp/ispccp2.c |
| index ca095238510d5..b64e218eaea6e 100644 |
| --- a/drivers/media/platform/omap3isp/ispccp2.c |
| +++ b/drivers/media/platform/omap3isp/ispccp2.c |
| @@ -1030,6 +1030,7 @@ int omap3isp_ccp2_register_entities(struct isp_ccp2_device *ccp2, |
| int ret; |
| |
| /* Register the subdev and video nodes. */ |
| + ccp2->subdev.dev = vdev->mdev->dev; |
| ret = v4l2_device_register_subdev(vdev, &ccp2->subdev); |
| if (ret < 0) |
| goto error; |
| diff --git a/drivers/media/platform/omap3isp/ispcsi2.c b/drivers/media/platform/omap3isp/ispcsi2.c |
| index f75a1be29d84a..27a2913363b62 100644 |
| --- a/drivers/media/platform/omap3isp/ispcsi2.c |
| +++ b/drivers/media/platform/omap3isp/ispcsi2.c |
| @@ -1206,6 +1206,7 @@ int omap3isp_csi2_register_entities(struct isp_csi2_device *csi2, |
| int ret; |
| |
| /* Register the subdev and video nodes. */ |
| + csi2->subdev.dev = vdev->mdev->dev; |
| ret = v4l2_device_register_subdev(vdev, &csi2->subdev); |
| if (ret < 0) |
| goto error; |
| diff --git a/drivers/media/platform/omap3isp/isppreview.c b/drivers/media/platform/omap3isp/isppreview.c |
| index ac30a0f837801..e981eb2330f18 100644 |
| --- a/drivers/media/platform/omap3isp/isppreview.c |
| +++ b/drivers/media/platform/omap3isp/isppreview.c |
| @@ -2228,6 +2228,7 @@ int omap3isp_preview_register_entities(struct isp_prev_device *prev, |
| int ret; |
| |
| /* Register the subdev and video nodes. */ |
| + prev->subdev.dev = vdev->mdev->dev; |
| ret = v4l2_device_register_subdev(vdev, &prev->subdev); |
| if (ret < 0) |
| goto error; |
| diff --git a/drivers/media/platform/omap3isp/ispresizer.c b/drivers/media/platform/omap3isp/ispresizer.c |
| index 0b6a87508584f..2035e3c6a9dee 100644 |
| --- a/drivers/media/platform/omap3isp/ispresizer.c |
| +++ b/drivers/media/platform/omap3isp/ispresizer.c |
| @@ -1684,6 +1684,7 @@ int omap3isp_resizer_register_entities(struct isp_res_device *res, |
| int ret; |
| |
| /* Register the subdev and video nodes. */ |
| + res->subdev.dev = vdev->mdev->dev; |
| ret = v4l2_device_register_subdev(vdev, &res->subdev); |
| if (ret < 0) |
| goto error; |
| diff --git a/drivers/media/platform/omap3isp/ispstat.c b/drivers/media/platform/omap3isp/ispstat.c |
| index 1b9217d3b1b6a..4a4ae637655ba 100644 |
| --- a/drivers/media/platform/omap3isp/ispstat.c |
| +++ b/drivers/media/platform/omap3isp/ispstat.c |
| @@ -1010,6 +1010,8 @@ void omap3isp_stat_unregister_entities(struct ispstat *stat) |
| int omap3isp_stat_register_entities(struct ispstat *stat, |
| struct v4l2_device *vdev) |
| { |
| + stat->subdev.dev = vdev->mdev->dev; |
| + |
| return v4l2_device_register_subdev(vdev, &stat->subdev); |
| } |
| |
| -- |
| 2.20.1 |
| |