aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/saa7134/saa7134-video.c
diff options
context:
space:
mode:
authorOndrej Zary <linux@rainbow-software.org>2013-02-01 18:01:18 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-04-14 18:27:09 -0400
commitce5bdd52629ebb50f65db03e6dfa9c96697d0d40 (patch)
tree1c1b4ce16a6b61e3fef7d01a4f922c14a5208619 /drivers/media/pci/saa7134/saa7134-video.c
parent0a5ea88b31bed56350939c6a99c4cd58904baa66 (diff)
[media] saa7134: v4l2-compliance: fix g_tuner/s_tuner
Make saa7134 driver more V4L2 compliant: return real frequency range in g_tuner and fail in s_tuner for non-zero tuner Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/pci/saa7134/saa7134-video.c')
-rw-r--r--drivers/media/pci/saa7134/saa7134-video.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
index 506a9f401db7..b832684b940a 100644
--- a/drivers/media/pci/saa7134/saa7134-video.c
+++ b/drivers/media/pci/saa7134/saa7134-video.c
@@ -2014,11 +2014,11 @@ static int saa7134_g_tuner(struct file *file, void *priv,
2014 if (NULL != card_in(dev, n).name) { 2014 if (NULL != card_in(dev, n).name) {
2015 strcpy(t->name, "Television"); 2015 strcpy(t->name, "Television");
2016 t->type = V4L2_TUNER_ANALOG_TV; 2016 t->type = V4L2_TUNER_ANALOG_TV;
2017 saa_call_all(dev, tuner, g_tuner, t);
2017 t->capability = V4L2_TUNER_CAP_NORM | 2018 t->capability = V4L2_TUNER_CAP_NORM |
2018 V4L2_TUNER_CAP_STEREO | 2019 V4L2_TUNER_CAP_STEREO |
2019 V4L2_TUNER_CAP_LANG1 | 2020 V4L2_TUNER_CAP_LANG1 |
2020 V4L2_TUNER_CAP_LANG2; 2021 V4L2_TUNER_CAP_LANG2;
2021 t->rangehigh = 0xffffffffUL;
2022 t->rxsubchans = saa7134_tvaudio_getstereo(dev); 2022 t->rxsubchans = saa7134_tvaudio_getstereo(dev);
2023 t->audmode = saa7134_tvaudio_rx2mode(t->rxsubchans); 2023 t->audmode = saa7134_tvaudio_rx2mode(t->rxsubchans);
2024 } 2024 }
@@ -2034,6 +2034,9 @@ static int saa7134_s_tuner(struct file *file, void *priv,
2034 struct saa7134_dev *dev = fh->dev; 2034 struct saa7134_dev *dev = fh->dev;
2035 int rx, mode; 2035 int rx, mode;
2036 2036
2037 if (0 != t->index)
2038 return -EINVAL;
2039
2037 mode = dev->thread.mode; 2040 mode = dev->thread.mode;
2038 if (UNSET == mode) { 2041 if (UNSET == mode) {
2039 rx = saa7134_tvaudio_getstereo(dev); 2042 rx = saa7134_tvaudio_getstereo(dev);