[media] mem2mem: set missing v4l2_dev pointer

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

The m2m-deinterlace, mem2mem_testdev and mx2_emmaprp drivers didn't set
the v4l2_dev pointer in struct video_device, even though a v4l2_device was
registered correctly. These days this v4l2_dev pointer must be set correctly,
so this patch adds that for these three drivers.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by

Hans Verkuil and committed by

Mauro Carvalho Chehab 12 years ago 8f484d87 ae09e9e7

+4 -1

3 changed files

expand all

drivers

media

platform

m2m-deinterlace.c

mem2mem_testdev.c

mx2_emmaprp.c

drivers/media/platform/m2m-deinterlace.c

··· 1033 1033 1034 1034 *vfd = deinterlace_videodev; 1035 1035 vfd->lock = &pcdev->dev_mutex; 1036 + vfd->v4l2_dev = &pcdev->v4l2_dev; 1036 1037 1037 1038 ret = video_register_device(vfd, VFL_TYPE_GRABBER, 0); 1038 1039 if (ret) {

+2 -1

drivers/media/platform/mem2mem_testdev.c

··· 1051 1051 1052 1052 *vfd = m2mtest_videodev; 1053 1053 vfd->lock = &dev->dev_mutex; 1054 + vfd->v4l2_dev = &dev->v4l2_dev; 1054 1055 1055 1056 ret = video_register_device(vfd, VFL_TYPE_GRABBER, 0); 1056 1057 if (ret) { ··· 1062 1061 video_set_drvdata(vfd, dev); 1063 1062 snprintf(vfd->name, sizeof(vfd->name), "%s", m2mtest_videodev.name); 1064 1063 dev->vfd = vfd; 1065 - v4l2_info(&dev->v4l2_dev, MEM2MEM_TEST_MODULE_NAME 1064 + v4l2_info(&dev->v4l2_dev, 1066 1065 "Device registered as /dev/video%d\n", vfd->num); 1067 1066 1068 1067 setup_timer(&dev->timer, device_isr, (long)dev);

drivers/media/platform/mx2_emmaprp.c

··· 937 937 938 938 *vfd = emmaprp_videodev; 939 939 vfd->lock = &pcdev->dev_mutex; 940 + vfd->v4l2_dev = &pcdev->v4l2_dev; 940 941 941 942 video_set_drvdata(vfd, pcdev); 942 943 snprintf(vfd->name, sizeof(vfd->name), "%s", emmaprp_videodev.name);