diff options
Diffstat (limited to 'drivers/media/common')
-rw-r--r-- | drivers/media/common/tuners/xc5000.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/common/tuners/xc5000.c b/drivers/media/common/tuners/xc5000.c index 215dad07f060..d2b2c12a5561 100644 --- a/drivers/media/common/tuners/xc5000.c +++ b/drivers/media/common/tuners/xc5000.c | |||
@@ -217,6 +217,7 @@ static int xc_send_i2c_data(struct xc5000_priv *priv, u8 *buf, int len) | |||
217 | return XC_RESULT_SUCCESS; | 217 | return XC_RESULT_SUCCESS; |
218 | } | 218 | } |
219 | 219 | ||
220 | #if 0 | ||
220 | /* This routine is never used because the only time we read data from the | 221 | /* This routine is never used because the only time we read data from the |
221 | i2c bus is when we read registers, and we want that to be an atomic i2c | 222 | i2c bus is when we read registers, and we want that to be an atomic i2c |
222 | transaction in case we are on a multi-master bus */ | 223 | 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) | |||
231 | } | 232 | } |
232 | return 0; | 233 | return 0; |
233 | } | 234 | } |
235 | #endif | ||
234 | 236 | ||
235 | static int xc5000_readreg(struct xc5000_priv *priv, u16 reg, u16 *val) | 237 | static int xc5000_readreg(struct xc5000_priv *priv, u16 reg, u16 *val) |
236 | { | 238 | { |
@@ -295,7 +297,7 @@ static int xc_write_reg(struct xc5000_priv *priv, u16 regAddr, u16 i2cData) | |||
295 | if (result == XC_RESULT_SUCCESS) { | 297 | if (result == XC_RESULT_SUCCESS) { |
296 | /* wait for busy flag to clear */ | 298 | /* wait for busy flag to clear */ |
297 | while ((WatchDogTimer > 0) && (result == XC_RESULT_SUCCESS)) { | 299 | while ((WatchDogTimer > 0) && (result == XC_RESULT_SUCCESS)) { |
298 | result = xc5000_readreg(priv, XREG_BUSY, buf); | 300 | result = xc5000_readreg(priv, XREG_BUSY, (u16 *)buf); |
299 | if (result == XC_RESULT_SUCCESS) { | 301 | if (result == XC_RESULT_SUCCESS) { |
300 | if ((buf[0] == 0) && (buf[1] == 0)) { | 302 | if ((buf[0] == 0) && (buf[1] == 0)) { |
301 | /* busy flag cleared */ | 303 | /* busy flag cleared */ |