diff options
| author |   Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2021-02-02 15:49:23 +0100 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2021-03-22 10:14:23 +0100 |
| commit | 1a28dce222a6ece725689ad58c0cf4a1b48894f4 (patch) | |
| tree | 6efee494932d8327bccf7ca0c9b0f947fc860bb1 /drivers/media/test-drivers/vim2m.c | |
| parent | media: uapi: vp8: Fix kernel-doc warnings (diff) | |
| download | linux-dev-1a28dce222a6ece725689ad58c0cf4a1b48894f4.tar.xz linux-dev-1a28dce222a6ece725689ad58c0cf4a1b48894f4.zip | |
media: vim2m: initialize the media device earlier
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>
Diffstat (limited to 'drivers/media/test-drivers/vim2m.c')
| -rw-r--r-- | drivers/media/test-drivers/vim2m.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/media/test-drivers/vim2m.c b/drivers/media/test-drivers/vim2m.c index 331a9053a0ed..a24624353f9e 100644 --- a/drivers/media/test-drivers/vim2m.c +++ b/drivers/media/test-drivers/vim2m.c @@ -1339,12 +1339,6 @@ static int vim2m_probe(struct platform_device *pdev) 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_device *pdev) 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) { |