Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a73bd4f authored by Hans Verkuil's avatar Hans Verkuil Committed by Greg Kroah-Hartman
Browse files

media: vim2m: initialize the media device earlier 



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: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarMark-PK Tsai <mark-pk.tsai@mediatek.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b7248281

drivers/media/platform/vim2m.c

+8 −6
Original line number Original line Diff line number Diff line
@@ -1347,12 +1347,6 @@ static int vim2m_probe(struct platform_device *pdev) 
		goto error_dev;

		goto error_dev;

	}

	}





	ret = video_register_device(vfd, VFL_TYPE_GRABBER, 0);

	if (ret) {

		v4l2_err(&dev->v4l2_dev, "Failed to register video device\n");

		goto error_m2m;

	}



#ifdef CONFIG_MEDIA_CONTROLLER

#ifdef CONFIG_MEDIA_CONTROLLER

	dev->mdev.dev = &pdev->dev;

	dev->mdev.dev = &pdev->dev;

	strscpy(dev->mdev.model, "vim2m", sizeof(dev->mdev.model));

	strscpy(dev->mdev.model, "vim2m", sizeof(dev->mdev.model));
@@ -1361,7 +1355,15 @@ static int vim2m_probe(struct platform_device *pdev) 
	media_device_init(&dev->mdev);

	media_device_init(&dev->mdev);

	dev->mdev.ops = &m2m_media_ops;

	dev->mdev.ops = &m2m_media_ops;

	dev->v4l2_dev.mdev = &dev->mdev;

	dev->v4l2_dev.mdev = &dev->mdev;

#endif





	ret = video_register_device(vfd, VFL_TYPE_GRABBER, 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,

	ret = v4l2_m2m_register_media_controller(dev->m2m_dev, vfd,

						 MEDIA_ENT_F_PROC_VIDEO_SCALER);

						 MEDIA_ENT_F_PROC_VIDEO_SCALER);

	if (ret) {

	if (ret) {