diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-27 22:44:16 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-27 22:44:16 -0200 |
| commit | 21877231e3db3aea6295d62290c7a5f9fe7e6d84 (patch) | |
| tree | 3f4de15e28ed053355d432c381f6f7dff368e016 /linux/drivers/media/common | |
| parent | 3b3a0da046f354c968c609f25969e0acbf01ce93 (diff) | |
| parent | 154d4bd2331d957d5fa42d52b405e62796570e32 (diff) | |
| download | mediapointer-dvb-s2-21877231e3db3aea6295d62290c7a5f9fe7e6d84.tar.gz mediapointer-dvb-s2-21877231e3db3aea6295d62290c7a5f9fe7e6d84.tar.bz2 | |
merge: http://linuxtv.org/hg/~anttip/af9015/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/common')
| -rw-r--r-- | linux/drivers/media/common/saa7146_fops.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/linux/drivers/media/common/saa7146_fops.c b/linux/drivers/media/common/saa7146_fops.c index 4384bd16c..c6cc8574a 100644 --- a/linux/drivers/media/common/saa7146_fops.c +++ b/linux/drivers/media/common/saa7146_fops.c @@ -512,6 +512,7 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev, struct saa7146_vv *vv = dev->vv_data; struct video_device *vfd; int err; + int i; DEB_EE(("dev:%p, name:'%s', type:%d\n",dev,name,type)); @@ -521,9 +522,11 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev, return -ENOMEM; vfd->fops = &video_fops; - vfd->ioctl_ops = dev->ext_vv_data ? &dev->ext_vv_data->ops : - &saa7146_video_ioctl_ops; + vfd->ioctl_ops = &dev->ext_vv_data->ops; 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)); video_set_drvdata(vfd, dev); |