summaryrefslogtreecommitdiffstats
path: root/drivers/media/tuners
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2013-04-09 21:29:40 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-04-16 21:26:06 -0300
commita7dd065f4976b54d0e75d58f8e94066501fede76 (patch)
tree9a59ca570933de7175c1972898a063df4a6baba7 /drivers/media/tuners
parentfa4bfd2bd0548c0e5e0d931147df45157686de71 (diff)
downloadlinux-a7dd065f4976b54d0e75d58f8e94066501fede76.tar.bz2
[media] r820t: use the right IF for the selected TV standard
IF is set at r820t_set_tv_standard(). So, we can't calculate LO frequency before calling it. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Tested-by: Antti Palosaari <crope@iki.fi>
Diffstat (limited to 'drivers/media/tuners')
-rw-r--r--drivers/media/tuners/r820t.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/tuners/r820t.c b/drivers/media/tuners/r820t.c
index 2ecf1d2ab82f..48ff6bb75f81 100644
--- a/drivers/media/tuners/r820t.c
+++ b/drivers/media/tuners/r820t.c
@@ -1193,15 +1193,15 @@ static int generic_set_freq(struct dvb_frontend *fe,
tuner_dbg("should set frequency to %d kHz, bw %d MHz\n",
freq / 1000, bw);
+ rc = r820t_set_tv_standard(priv, bw, type, std, delsys);
+ if (rc < 0)
+ goto err;
+
if ((type == V4L2_TUNER_ANALOG_TV) && (std == V4L2_STD_SECAM_LC))
lo_freq = freq - priv->int_freq;
else
lo_freq = freq + priv->int_freq;
- rc = r820t_set_tv_standard(priv, bw, type, std, delsys);
- if (rc < 0)
- goto err;
-
rc = r820t_set_mux(priv, lo_freq);
if (rc < 0)
goto err;