diff --git a/[refs] b/[refs] index 0d40f7ec1b60..5ea205167370 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa4bfd2bd0548c0e5e0d931147df45157686de71 +refs/heads/master: a7dd065f4976b54d0e75d58f8e94066501fede76 diff --git a/trunk/drivers/media/tuners/r820t.c b/trunk/drivers/media/tuners/r820t.c index 2ecf1d2ab82f..48ff6bb75f81 100644 --- a/trunk/drivers/media/tuners/r820t.c +++ b/trunk/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;