From a5ff749823866783206deb76b3cff82fb24a42d6 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed, 10 Apr 2013 10:53:35 -0300
Subject: [PATCH] --- yaml --- r: 367135 b: refs/heads/master c:
 226471a18f5458d42aac52bca62ebd8edeb37a96 h: refs/heads/master i:   367133:
 f08d059e08ec90adcdc7bd3fdb0f9a0286d5687d   367131:
 50543ada6fc83fef1255a626947b6c7eb455de12   367127:
 3a2918908381010494627f1d0d3f89c711c7a168   367119:
 f80d920e71e174160f36cb6f3385c634c51ef607   367103:
 ca901e4e507b99b6af1134d449bb4015924a1efb v: v3

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

diff --git a/[refs] b/[refs]
index 623bc4702f87..e231748f4833 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8678b03428b6894d146695980f04f26af7b9b3ec
+refs/heads/master: 226471a18f5458d42aac52bca62ebd8edeb37a96
diff --git a/trunk/drivers/media/tuners/r820t.c b/trunk/drivers/media/tuners/r820t.c
index ef100ab3564d..e9367d896a07 100644
--- a/trunk/drivers/media/tuners/r820t.c
+++ b/trunk/drivers/media/tuners/r820t.c
@@ -425,7 +425,7 @@ static int r820t_write_reg_mask(struct r820t_priv *priv, u8 reg, u8 val,
 	return r820t_write(priv, reg, &val, 1);
 }
 
-static int r820_read(struct r820t_priv *priv, u8 reg, u8 *val, int len)
+static int r820t_read(struct r820t_priv *priv, u8 reg, u8 *val, int len)
 {
 	int rc, i;
 	u8 *p = &priv->buf[1];
@@ -573,7 +573,7 @@ static int r820t_set_pll(struct r820t_priv *priv, u32 freq)
 		mix_div = mix_div << 1;
 	}
 
-	rc = r820_read(priv, 0x00, data, sizeof(data));
+	rc = r820t_read(priv, 0x00, data, sizeof(data));
 	if (rc < 0)
 		return rc;
 
@@ -660,7 +660,7 @@ static int r820t_set_pll(struct r820t_priv *priv, u32 freq)
 		msleep(10);
 
 		/* Check if PLL has locked */
-		rc = r820_read(priv, 0x00, data, 3);
+		rc = r820t_read(priv, 0x00, data, 3);
 		if (rc < 0)
 			return rc;
 		if (data[2] & 0x40)
@@ -1062,7 +1062,7 @@ static int r820t_set_tv_standard(struct r820t_priv *priv,
 				return rc;
 
 			/* Check if calibration worked */
-			rc = r820_read(priv, 0x00, data, sizeof(data));
+			rc = r820t_read(priv, 0x00, data, sizeof(data));
 			if (rc < 0)
 				return rc;
 
@@ -1135,7 +1135,7 @@ static int r820t_read_gain(struct r820t_priv *priv)
 	u8 data[4];
 	int rc;
 
-	rc = r820_read(priv, 0x00, data, sizeof(data));
+	rc = r820t_read(priv, 0x00, data, sizeof(data));
 	if (rc < 0)
 		return rc;
 
@@ -1163,7 +1163,7 @@ static int r820t_set_gain_mode(struct r820t_priv *priv,
 		if (rc < 0)
 			return rc;
 
-		rc = r820_read(priv, 0x00, data, sizeof(data));
+		rc = r820t_read(priv, 0x00, data, sizeof(data));
 		if (rc < 0)
 			return rc;
 
@@ -1349,7 +1349,7 @@ static int r820t_xtal_check(struct r820t_priv *priv)
 
 		msleep(5);
 
-		rc = r820_read(priv, 0x00, data, sizeof(data));
+		rc = r820t_read(priv, 0x00, data, sizeof(data));
 		if (rc < 0)
 			return rc;
 		if ((!data[2]) & 0x40)
@@ -1621,7 +1621,7 @@ struct dvb_frontend *r820t_attach(struct dvb_frontend *fe,
 		fe->ops.i2c_gate_ctrl(fe, 1);
 
 	/* check if the tuner is there */
-	rc = r820_read(priv, 0x00, data, sizeof(data));
+	rc = r820t_read(priv, 0x00, data, sizeof(data));
 	if (rc < 0)
 		goto err;