From 53386c97c24ec85be13072947f3d37e870491047 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 5 Jul 2010 18:38:46 -0300 Subject: [PATCH] --- yaml --- r: 202072 b: refs/heads/master c: 1cdffda73fb70b211be5b1c2428ddea4f9a223ea h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/common/tuners/xc5000.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bd5df26c7662..ff814ac4022c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43c2407820d5406bde3c8069583a37fba9c09faf +refs/heads/master: 1cdffda73fb70b211be5b1c2428ddea4f9a223ea diff --git a/trunk/drivers/media/common/tuners/xc5000.c b/trunk/drivers/media/common/tuners/xc5000.c index 215dad07f060..d2b2c12a5561 100644 --- a/trunk/drivers/media/common/tuners/xc5000.c +++ b/trunk/drivers/media/common/tuners/xc5000.c @@ -217,6 +217,7 @@ static int xc_send_i2c_data(struct xc5000_priv *priv, u8 *buf, int len) return XC_RESULT_SUCCESS; } +#if 0 /* This routine is never used because the only time we read data from the i2c bus is when we read registers, and we want that to be an atomic i2c transaction in case we are on a multi-master bus */ @@ -231,6 +232,7 @@ static int xc_read_i2c_data(struct xc5000_priv *priv, u8 *buf, int len) } return 0; } +#endif static int xc5000_readreg(struct xc5000_priv *priv, u16 reg, u16 *val) { @@ -295,7 +297,7 @@ static int xc_write_reg(struct xc5000_priv *priv, u16 regAddr, u16 i2cData) if (result == XC_RESULT_SUCCESS) { /* wait for busy flag to clear */ while ((WatchDogTimer > 0) && (result == XC_RESULT_SUCCESS)) { - result = xc5000_readreg(priv, XREG_BUSY, buf); + result = xc5000_readreg(priv, XREG_BUSY, (u16 *)buf); if (result == XC_RESULT_SUCCESS) { if ((buf[0] == 0) && (buf[1] == 0)) { /* busy flag cleared */