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 a6a61cce43ddadf6ca095990289852f5b3d86aca..e349f5d990b73e44897d8bf4672e93d578d72f79 100644 (file)
--- a/drivers/media/platform/omap3isp/ispccdc.c
+++ b/drivers/media/platform/omap3isp/ispccdc.c
@@ -2603,6 +2603,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 38e6a974c5b1e8cd58ae6263d936ea0c42d791e4..e6b19b785c2f4661c719fb0ade0f6712cc9b9923 100644 (file)
--- a/drivers/media/platform/omap3isp/ispccp2.c
+++ b/drivers/media/platform/omap3isp/ispccp2.c
@@ -1025,6 +1025,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 a78338d012b4df76cea20b0ff882c62a2d28edf0..029b434b760947736f12f8fbd98319e389e2874f 100644 (file)
--- a/drivers/media/platform/omap3isp/ispcsi2.c
+++ b/drivers/media/platform/omap3isp/ispcsi2.c
@@ -1201,6 +1201,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 13803270d1045ee7d02ec04be642793c30b273fe..c9e8845de1b1d2829906e032dd58edbf6ed6d35e 100644 (file)
--- a/drivers/media/platform/omap3isp/isppreview.c
+++ b/drivers/media/platform/omap3isp/isppreview.c
@@ -2223,6 +2223,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 7cfb43dc0ffd7764c89bc95eae87ac97e53271e8..d4e53cbe91936e004aef46765b7593a29892354f 100644 (file)
--- a/drivers/media/platform/omap3isp/ispresizer.c
+++ b/drivers/media/platform/omap3isp/ispresizer.c
@@ -1679,6 +1679,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 94d4c295d3d00ff4f3442f7c069c978ce4e00f07..c54c5c494b75154113e25d89b1e03c657d7c0613 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);
 }