aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-06-20 05:09:52 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-12 11:17:32 -0400
commitf101a2a7877d0573d93649a62c4ed65284e7ed9d (patch)
tree91ea6f8f1a15aefac92bae675fb3b51c0775e520 /drivers
parent3c86cf7a7d323019a7942df8bacf47c9fd2c31fa (diff)
V4L/DVB (12216): saa7134: set RDS capability if applicable.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/saa7134/saa7134-core.c4
-rw-r--r--drivers/media/video/saa7134/saa7134-video.c2
-rw-r--r--drivers/media/video/saa7134/saa7134.h1
3 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 94a023a14bbc..cb78c956d810 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -1012,8 +1012,10 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
1012 sd = v4l2_i2c_new_probed_subdev_addr(&dev->v4l2_dev, 1012 sd = v4l2_i2c_new_probed_subdev_addr(&dev->v4l2_dev,
1013 &dev->i2c_adap, "saa6588", "saa6588", 1013 &dev->i2c_adap, "saa6588", "saa6588",
1014 saa7134_boards[dev->board].rds_addr); 1014 saa7134_boards[dev->board].rds_addr);
1015 if (sd) 1015 if (sd) {
1016 printk(KERN_INFO "%s: found RDS decoder\n", dev->name); 1016 printk(KERN_INFO "%s: found RDS decoder\n", dev->name);
1017 dev->has_rds = 1;
1018 }
1017 } 1019 }
1018 1020
1019 request_submodules(dev); 1021 request_submodules(dev);
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index bf4c99d19150..58854df5382b 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -1819,6 +1819,8 @@ static int saa7134_querycap(struct file *file, void *priv,
1819 V4L2_CAP_READWRITE | 1819 V4L2_CAP_READWRITE |
1820 V4L2_CAP_STREAMING | 1820 V4L2_CAP_STREAMING |
1821 V4L2_CAP_TUNER; 1821 V4L2_CAP_TUNER;
1822 if (dev->has_rds)
1823 cap->capabilities |= V4L2_CAP_RDS_CAPTURE;
1822 if (saa7134_no_overlay <= 0) 1824 if (saa7134_no_overlay <= 0)
1823 cap->capabilities |= V4L2_CAP_VIDEO_OVERLAY; 1825 cap->capabilities |= V4L2_CAP_VIDEO_OVERLAY;
1824 1826
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index fb564f14887c..ab28a691e09a 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -539,6 +539,7 @@ struct saa7134_dev {
539 struct i2c_adapter i2c_adap; 539 struct i2c_adapter i2c_adap;
540 struct i2c_client i2c_client; 540 struct i2c_client i2c_client;
541 unsigned char eedata[256]; 541 unsigned char eedata[256];
542 int has_rds;
542 543
543 /* video overlay */ 544 /* video overlay */
544 struct v4l2_framebuffer ovbuf; 545 struct v4l2_framebuffer ovbuf;