lkml.org 
[lkml]   [2022]   [May]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 008/163] media: vim2m: initialize the media device earlier
    Date
    From: Hans Verkuil <hverkuil-cisco@xs4all.nl>

    commit 1a28dce222a6ece725689ad58c0cf4a1b48894f4 upstream.

    Before the video device node is registered, the v4l2_dev.mdev
    pointer must be set in order to correctly associate the video
    device with the media device. Move the initialization of the
    media device up.

    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/media/test-drivers/vim2m.c | 14 ++++++++------
    1 file changed, 8 insertions(+), 6 deletions(-)

    --- a/drivers/media/test-drivers/vim2m.c
    +++ b/drivers/media/test-drivers/vim2m.c
    @@ -1339,12 +1339,6 @@ static int vim2m_probe(struct platform_d
    goto error_dev;
    }

    - ret = video_register_device(vfd, VFL_TYPE_VIDEO, 0);
    - if (ret) {
    - v4l2_err(&dev->v4l2_dev, "Failed to register video device\n");
    - goto error_m2m;
    - }
    -
    #ifdef CONFIG_MEDIA_CONTROLLER
    dev->mdev.dev = &pdev->dev;
    strscpy(dev->mdev.model, "vim2m", sizeof(dev->mdev.model));
    @@ -1353,7 +1347,15 @@ static int vim2m_probe(struct platform_d
    media_device_init(&dev->mdev);
    dev->mdev.ops = &m2m_media_ops;
    dev->v4l2_dev.mdev = &dev->mdev;
    +#endif

    + ret = video_register_device(vfd, VFL_TYPE_VIDEO, 0);
    + if (ret) {
    + v4l2_err(&dev->v4l2_dev, "Failed to register video device\n");
    + goto error_m2m;
    + }
    +
    +#ifdef CONFIG_MEDIA_CONTROLLER
    ret = v4l2_m2m_register_media_controller(dev->m2m_dev, vfd,
    MEDIA_ENT_F_PROC_VIDEO_SCALER);
    if (ret) {

    \
     
     \ /
      Last update: 2022-05-27 11:07    [W:2.985 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site