diff --git a/drivers/media/tuners/r820t.c b/drivers/media/tuners/r820t.c
index e63ee94..8d99779 100644
--- a/drivers/media/tuners/r820t.c
+++ b/drivers/media/tuners/r820t.c
@@ -1163,6 +1163,8 @@
 	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 @@
 
 	return 0;
 }
-
+#endif
 
 static int generic_set_freq(struct dvb_frontend *fe,
 			    u32 freq /* in HZ */,
@@ -1261,10 +1263,6 @@
 	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;