Commit b860dbe3 authored by Sakari Ailus's avatar Sakari Ailus Committed by Khalid Elmously

media: omap3isp: Set device on omap3isp subdevs

BugLink: https://bugs.launchpad.net/bugs/1848589

[ Upstream commit e9eb103f ]

The omap3isp driver registered subdevs without the dev field being set. Do
that now.
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarConnor Kuehl <connor.kuehl@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent 5d8dccb5
...@@ -2603,6 +2603,7 @@ int omap3isp_ccdc_register_entities(struct isp_ccdc_device *ccdc, ...@@ -2603,6 +2603,7 @@ int omap3isp_ccdc_register_entities(struct isp_ccdc_device *ccdc,
int ret; int ret;
/* Register the subdev and video node. */ /* Register the subdev and video node. */
ccdc->subdev.dev = vdev->mdev->dev;
ret = v4l2_device_register_subdev(vdev, &ccdc->subdev); ret = v4l2_device_register_subdev(vdev, &ccdc->subdev);
if (ret < 0) if (ret < 0)
goto error; goto error;
......
...@@ -1025,6 +1025,7 @@ int omap3isp_ccp2_register_entities(struct isp_ccp2_device *ccp2, ...@@ -1025,6 +1025,7 @@ int omap3isp_ccp2_register_entities(struct isp_ccp2_device *ccp2,
int ret; int ret;
/* Register the subdev and video nodes. */ /* Register the subdev and video nodes. */
ccp2->subdev.dev = vdev->mdev->dev;
ret = v4l2_device_register_subdev(vdev, &ccp2->subdev); ret = v4l2_device_register_subdev(vdev, &ccp2->subdev);
if (ret < 0) if (ret < 0)
goto error; goto error;
......
...@@ -1201,6 +1201,7 @@ int omap3isp_csi2_register_entities(struct isp_csi2_device *csi2, ...@@ -1201,6 +1201,7 @@ int omap3isp_csi2_register_entities(struct isp_csi2_device *csi2,
int ret; int ret;
/* Register the subdev and video nodes. */ /* Register the subdev and video nodes. */
csi2->subdev.dev = vdev->mdev->dev;
ret = v4l2_device_register_subdev(vdev, &csi2->subdev); ret = v4l2_device_register_subdev(vdev, &csi2->subdev);
if (ret < 0) if (ret < 0)
goto error; goto error;
......
...@@ -2223,6 +2223,7 @@ int omap3isp_preview_register_entities(struct isp_prev_device *prev, ...@@ -2223,6 +2223,7 @@ int omap3isp_preview_register_entities(struct isp_prev_device *prev,
int ret; int ret;
/* Register the subdev and video nodes. */ /* Register the subdev and video nodes. */
prev->subdev.dev = vdev->mdev->dev;
ret = v4l2_device_register_subdev(vdev, &prev->subdev); ret = v4l2_device_register_subdev(vdev, &prev->subdev);
if (ret < 0) if (ret < 0)
goto error; goto error;
......
...@@ -1679,6 +1679,7 @@ int omap3isp_resizer_register_entities(struct isp_res_device *res, ...@@ -1679,6 +1679,7 @@ int omap3isp_resizer_register_entities(struct isp_res_device *res,
int ret; int ret;
/* Register the subdev and video nodes. */ /* Register the subdev and video nodes. */
res->subdev.dev = vdev->mdev->dev;
ret = v4l2_device_register_subdev(vdev, &res->subdev); ret = v4l2_device_register_subdev(vdev, &res->subdev);
if (ret < 0) if (ret < 0)
goto error; goto error;
......
...@@ -1010,6 +1010,8 @@ void omap3isp_stat_unregister_entities(struct ispstat *stat) ...@@ -1010,6 +1010,8 @@ void omap3isp_stat_unregister_entities(struct ispstat *stat)
int omap3isp_stat_register_entities(struct ispstat *stat, int omap3isp_stat_register_entities(struct ispstat *stat,
struct v4l2_device *vdev) struct v4l2_device *vdev)
{ {
stat->subdev.dev = vdev->mdev->dev;
return v4l2_device_register_subdev(vdev, &stat->subdev); return v4l2_device_register_subdev(vdev, &stat->subdev);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment