media: omap3isp: Set device on omap3isp subdevs

[ 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>

diff --git a/drivers/media/platform/omap3isp/ispccdc.c b/drivers/media/platform/omap3isp/ispccdc.c
index 882310eb45ccfa51e309769058a21433aa485655..fe16fbd95221ff70db402220276100616796f5db 100644 (file)
--- 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 ca095238510d5774109e114eb795c441be763dbf..b64e218eaea6e256ad66b33f12d7bcf423e23377 100644 (file)
--- 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 f75a1be29d84aa1f8ff63f2a60f557297369989d..27a2913363b62dfc72415df2cc7ccafd3f9fba72 100644 (file)
--- 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 ac30a0f837801ae57d3227429e4492a23306a0a9..e981eb2330f1813b9a00f6867872630a2180da1b 100644 (file)
--- 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 0b6a87508584f4eb5201f3f2b0bf284c1b7380f7..2035e3c6a9deeeb5660d25ae690b4719ac9e4ebb 100644 (file)
--- 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 1b9217d3b1b6af3b01a2979cc9a7cea28c027718..4a4ae637655ba1a54b435b35761641c3307fb3e0 100644 (file)
--- 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);
 }