| Message ID | 1359315912-1767-6-git-send-email-linux@rainbow-software.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun January 27 2013 20:45:10 Ondrej Zary wrote: > 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> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> > --- > drivers/media/pci/saa7134/saa7134-video.c | 5 ++++- > 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 87b2b9e..0b42f0c 100644 > --- a/drivers/media/pci/saa7134/saa7134-video.c > +++ b/drivers/media/pci/saa7134/saa7134-video.c > @@ -2011,11 +2011,11 @@ static int saa7134_g_tuner(struct file *file, void *priv, > if (NULL != card_in(dev, n).name) { > strcpy(t->name, "Television"); > t->type = V4L2_TUNER_ANALOG_TV; > + saa_call_all(dev, tuner, g_tuner, t); > t->capability = V4L2_TUNER_CAP_NORM | > V4L2_TUNER_CAP_STEREO | > V4L2_TUNER_CAP_LANG1 | > V4L2_TUNER_CAP_LANG2; > - t->rangehigh = 0xffffffffUL; > t->rxsubchans = saa7134_tvaudio_getstereo(dev); > t->audmode = saa7134_tvaudio_rx2mode(t->rxsubchans); > } > @@ -2031,6 +2031,9 @@ static int saa7134_s_tuner(struct file *file, void *priv, > struct saa7134_dev *dev = fh->dev; > int rx, mode; > > + if (0 != t->index) > + return -EINVAL; > + > mode = dev->thread.mode; > if (UNSET == mode) { > rx = saa7134_tvaudio_getstereo(dev); > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c index 87b2b9e..0b42f0c 100644 --- a/drivers/media/pci/saa7134/saa7134-video.c +++ b/drivers/media/pci/saa7134/saa7134-video.c @@ -2011,11 +2011,11 @@ static int saa7134_g_tuner(struct file *file, void *priv, if (NULL != card_in(dev, n).name) { strcpy(t->name, "Television"); t->type = V4L2_TUNER_ANALOG_TV; + saa_call_all(dev, tuner, g_tuner, t); t->capability = V4L2_TUNER_CAP_NORM | V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_LANG1 | V4L2_TUNER_CAP_LANG2; - t->rangehigh = 0xffffffffUL; t->rxsubchans = saa7134_tvaudio_getstereo(dev); t->audmode = saa7134_tvaudio_rx2mode(t->rxsubchans); } @@ -2031,6 +2031,9 @@ static int saa7134_s_tuner(struct file *file, void *priv, struct saa7134_dev *dev = fh->dev; int rx, mode; + if (0 != t->index) + return -EINVAL; + mode = dev->thread.mode; if (UNSET == mode) { rx = saa7134_tvaudio_getstereo(dev);
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> --- drivers/media/pci/saa7134/saa7134-video.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)