From 2cd0b4dc7f3e6c2692180d6b9745c0413d3302d8 Mon Sep 17 00:00:00 2001 From: Ondrej Zary Date: Fri, 1 Feb 2013 20:01:18 -0300 Subject: [PATCH] --- yaml --- r: 366999 b: refs/heads/master c: ce5bdd52629ebb50f65db03e6dfa9c96697d0d40 h: refs/heads/master i: 366997: 3bda4df15003d781fcdbd8e30c163e59b0ce265a 366995: 3e578a786db33c43c0d2f20dc33562b697b3c55d 366991: 398878f115cb61336427b2b7dbb5422dec49346c v: v3 --- [refs] | 2 +- trunk/drivers/media/pci/saa7134/saa7134-video.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a5b3f2797579..e3629c48fc85 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a5ea88b31bed56350939c6a99c4cd58904baa66 +refs/heads/master: ce5bdd52629ebb50f65db03e6dfa9c96697d0d40 diff --git a/trunk/drivers/media/pci/saa7134/saa7134-video.c b/trunk/drivers/media/pci/saa7134/saa7134-video.c index 506a9f401db7..b832684b940a 100644 --- a/trunk/drivers/media/pci/saa7134/saa7134-video.c +++ b/trunk/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);