From 3a2918908381010494627f1d0d3f89c711c7a168 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Tue, 9 Apr 2013 21:29:40 -0300
Subject: [PATCH] --- yaml --- r: 367127 b: refs/heads/master c:
 a7dd065f4976b54d0e75d58f8e94066501fede76 h: refs/heads/master i:   367125:
 4a67f7542b30ddeb30dd9118931a15271b427239   367123:
 ee550399647f5cd42f4843117f22d96ee7bd3043   367119:
 f80d920e71e174160f36cb6f3385c634c51ef607 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/media/tuners/r820t.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

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;