From 8fdb7be203479ccc04ff68b1d364a0700bdb6972 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Thu, 11 Apr 2013 16:20:53 -0300
Subject: [PATCH] --- yaml --- r: 367147 b: refs/heads/master c:
 dfdeac8108db5066e1adaf112adbe396ef27f0bc h: refs/heads/master i:   367145:
 5a4efc93ac41cb13d3e15a032135eff581ef072e   367143:
 d45f69e742a83a603b548fe6b128f9fce940d216 v: v3

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

diff --git a/[refs] b/[refs]
index 52e2dd063f0e..fecdac38e157 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8832e8f4293b1c9fce92a92e2506572f5b11775
+refs/heads/master: dfdeac8108db5066e1adaf112adbe396ef27f0bc
diff --git a/trunk/drivers/media/tuners/r820t.c b/trunk/drivers/media/tuners/r820t.c
index e63ee9443fa6..8d9977919d96 100644
--- a/trunk/drivers/media/tuners/r820t.c
+++ b/trunk/drivers/media/tuners/r820t.c
@@ -1163,6 +1163,8 @@ static int r820t_read_gain(struct r820t_priv *priv)
 	return ((data[3] & 0x0f) << 1) + ((data[3] & 0xf0) >> 4);
 }
 
+#if 0
+/* FIXME: This routine requires more testing */
 static int r820t_set_gain_mode(struct r820t_priv *priv,
 			       bool set_manual_gain,
 			       int gain)
@@ -1233,7 +1235,7 @@ static int r820t_set_gain_mode(struct r820t_priv *priv,
 
 	return 0;
 }
-
+#endif
 
 static int generic_set_freq(struct dvb_frontend *fe,
 			    u32 freq /* in HZ */,
@@ -1261,10 +1263,6 @@ static int generic_set_freq(struct dvb_frontend *fe,
 	if (rc < 0)
 		goto err;
 
-	rc = r820t_set_gain_mode(priv, false, 0);
-	if (rc < 0)
-		goto err;
-
 	rc = r820t_set_pll(priv, type, lo_freq);
 	if (rc < 0 || !priv->has_lock)
 		goto err;