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,
         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);
         }
@@ -2034,6 +2034,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);