kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

V4L/DVB (12216): saa7134: set RDS capability if applicable.

Browse source 
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-06-20 06:09:52 -03:00 committed by Mauro Carvalho Chehab
parent 3c86cf7a7d
commit f101a2a787
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/media/video/saa7134/saa7134-core.c
View file

@ -1012,8 +1012,10 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
sd = v4l2_i2c_new_probed_subdev_addr(&dev->v4l2_dev, sd = v4l2_i2c_new_probed_subdev_addr(&dev->v4l2_dev,
&dev->i2c_adap, "saa6588", "saa6588", &dev->i2c_adap, "saa6588", "saa6588",
saa7134_boards[dev->board].rds_addr); saa7134_boards[dev->board].rds_addr);
if (sd) if (sd) {
printk(KERN_INFO "%s: found RDS decoder\n", dev->name); printk(KERN_INFO "%s: found RDS decoder\n", dev->name);
dev->has_rds = 1;
}
} }
request_submodules(dev); request_submodules(dev);

2
drivers/media/video/saa7134/saa7134-video.c
View file

@ -1819,6 +1819,8 @@ static int saa7134_querycap(struct file *file, void *priv,
V4L2_CAP_READWRITE | V4L2_CAP_READWRITE |
V4L2_CAP_STREAMING | V4L2_CAP_STREAMING |
V4L2_CAP_TUNER; V4L2_CAP_TUNER;
if (dev->has_rds)
cap->capabilities |= V4L2_CAP_RDS_CAPTURE;
if (saa7134_no_overlay <= 0) if (saa7134_no_overlay <= 0)
cap->capabilities |= V4L2_CAP_VIDEO_OVERLAY; cap->capabilities |= V4L2_CAP_VIDEO_OVERLAY;

1
drivers/media/video/saa7134/saa7134.h
View file

@ -539,6 +539,7 @@ struct saa7134_dev {
struct i2c_adapter i2c_adap; struct i2c_adapter i2c_adap;
struct i2c_client i2c_client; struct i2c_client i2c_client;
unsigned char eedata[256]; unsigned char eedata[256];
int has_rds;
/* video overlay */ /* video overlay */
struct v4l2_framebuffer ovbuf; struct v4l2_framebuffer ovbuf;