leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V4L/DVB (10313): saa7146: fix VIDIOC_ENUMSTD.

Browse Source 
The previous conversion to video_ioctl2 broke VIDIOC_ENUMSTD. This
is now fixed.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil 2009-01-26 19:13:05 -03:00 committed by Mauro Carvalho Chehab
parent e22ed887ee
commit d0852ed27c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/common/saa7146_fops.c
View File

@ -511,6 +511,7 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev,
struct saa7146_vv *vv = dev->vv_data; struct saa7146_vv *vv = dev->vv_data;
struct video_device *vfd; struct video_device *vfd;
int err; int err;
int i;
DEB_EE(("dev:%p, name:'%s', type:%d\n",dev,name,type)); DEB_EE(("dev:%p, name:'%s', type:%d\n",dev,name,type));
@ -520,9 +521,11 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev,
return -ENOMEM; return -ENOMEM;
vfd->fops = &video_fops; vfd->fops = &video_fops;
vfd->ioctl_ops = dev->ext_vv_data ? &dev->ext_vv_data->ops : vfd->ioctl_ops = &dev->ext_vv_data->ops;
&saa7146_video_ioctl_ops;
vfd->release = video_device_release; vfd->release = video_device_release;
vfd->tvnorms = 0;
for (i = 0; i < dev->ext_vv_data->num_stds; i++)
vfd->tvnorms |= dev->ext_vv_data->stds[i].id;
strlcpy(vfd->name, name, sizeof(vfd->name)); strlcpy(vfd->name, name, sizeof(vfd->name));
video_set_drvdata(vfd, dev); video_set_drvdata(vfd, dev);