The patch number 10315 was added via Mauro Carvalho Chehab <mche...@redhat.com>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <linux-me...@vger.kernel.org>
------
From: Mauro Carvalho Chehab <mche...@redhat.com>
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-saa7146
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mche...@redhat.com>
---
linux/drivers/media/common/saa7146_fops.c | 7 +++++--
linux/drivers/media/video/cx25840/cx25840-core.c | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diff -r 92603e53d49e -r 8038735d2781 linux/drivers/media/common/saa7146_fops.c
--- a/linux/drivers/media/common/saa7146_fops.c Tue Jan 27 22:16:53 2009 -0200
+++ b/linux/drivers/media/common/saa7146_fops.c Tue Jan 27 22:30:35 2009 -0200
@@ -512,6 +512,7 @@ int saa7146_register_device(struct video
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
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);
diff -r 92603e53d49e -r 8038735d2781
linux/drivers/media/video/cx25840/cx25840-core.c
--- a/linux/drivers/media/video/cx25840/cx25840-core.c Tue Jan 27 22:16:53
2009 -0200
+++ b/linux/drivers/media/video/cx25840/cx25840-core.c Tue Jan 27 22:30:35
2009 -0200
@@ -1412,7 +1412,7 @@ static int cx25840_command(struct i2c_cl
static int cx25840_command(struct i2c_client *client, unsigned cmd, void *arg)
{
/* ignore this command */
- if (cmd == TUNER_SET_TYPE_ADDR)
+ if (cmd == TUNER_SET_TYPE_ADDR || cmd == TUNER_SET_CONFIG)
return 0;
/* Old-style drivers rely on initialization on first use, so
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/8038735d2781464dadbf328f6318874683d3c1a0
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
