lkml.org 
[lkml]   [2019]   [Oct]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.2 211/313] media: omap3isp: Set device on omap3isp subdevs
    Date
    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 1ba8a5ba343f6..e2f336c715a4d 100644
    --- a/drivers/media/platform/omap3isp/ispccdc.c
    +++ b/drivers/media/platform/omap3isp/ispccdc.c
    @@ -2602,6 +2602,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 efca45bb02c8b..d0a49cdfd22d2 100644
    --- a/drivers/media/platform/omap3isp/ispccp2.c
    +++ b/drivers/media/platform/omap3isp/ispccp2.c
    @@ -1031,6 +1031,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 e85917f4a50cc..fd493c5e4e24f 100644
    --- a/drivers/media/platform/omap3isp/ispcsi2.c
    +++ b/drivers/media/platform/omap3isp/ispcsi2.c
    @@ -1198,6 +1198,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 40e22400cf5ec..97d660606d984 100644
    --- a/drivers/media/platform/omap3isp/isppreview.c
    +++ b/drivers/media/platform/omap3isp/isppreview.c
    @@ -2225,6 +2225,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 21ca6954df72f..78d9dd7ea2da7 100644
    --- a/drivers/media/platform/omap3isp/ispresizer.c
    +++ b/drivers/media/platform/omap3isp/ispresizer.c
    @@ -1681,6 +1681,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 ca7bb8497c3da..cb5841f628cff 100644
    --- a/drivers/media/platform/omap3isp/ispstat.c
    +++ b/drivers/media/platform/omap3isp/ispstat.c
    @@ -1026,6 +1026,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


    \
     
     \ /
      Last update: 2019-10-03 19:10    [W:4.285 / U:0.576 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site