diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-09 20:29:40 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-16 20:26:06 -0400 |
commit | a7dd065f4976b54d0e75d58f8e94066501fede76 (patch) | |
tree | 9a59ca570933de7175c1972898a063df4a6baba7 /drivers/media | |
parent | fa4bfd2bd0548c0e5e0d931147df45157686de71 (diff) |
[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')
-rw-r--r-- | drivers/media/tuners/r820t.c | 8 |
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, | |||
1193 | tuner_dbg("should set frequency to %d kHz, bw %d MHz\n", | 1193 | tuner_dbg("should set frequency to %d kHz, bw %d MHz\n", |
1194 | freq / 1000, bw); | 1194 | freq / 1000, bw); |
1195 | 1195 | ||
1196 | rc = r820t_set_tv_standard(priv, bw, type, std, delsys); | ||
1197 | if (rc < 0) | ||
1198 | goto err; | ||
1199 | |||
1196 | if ((type == V4L2_TUNER_ANALOG_TV) && (std == V4L2_STD_SECAM_LC)) | 1200 | if ((type == V4L2_TUNER_ANALOG_TV) && (std == V4L2_STD_SECAM_LC)) |
1197 | lo_freq = freq - priv->int_freq; | 1201 | lo_freq = freq - priv->int_freq; |
1198 | else | 1202 | else |
1199 | lo_freq = freq + priv->int_freq; | 1203 | lo_freq = freq + priv->int_freq; |
1200 | 1204 | ||
1201 | rc = r820t_set_tv_standard(priv, bw, type, std, delsys); | ||
1202 | if (rc < 0) | ||
1203 | goto err; | ||
1204 | |||
1205 | rc = r820t_set_mux(priv, lo_freq); | 1205 | rc = r820t_set_mux(priv, lo_freq); |
1206 | if (rc < 0) | 1206 | if (rc < 0) |
1207 | goto err; | 1207 | goto err; |