diff options
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-i2c.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-i2c.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c index 711aa8e85fac..2577d03485b8 100644 --- a/drivers/media/video/saa7134/saa7134-i2c.c +++ b/drivers/media/video/saa7134/saa7134-i2c.c | |||
@@ -239,7 +239,7 @@ static int saa7134_i2c_xfer(struct i2c_adapter *i2c_adap, | |||
239 | unsigned char data; | 239 | unsigned char data; |
240 | int addr,rc,i,byte; | 240 | int addr,rc,i,byte; |
241 | 241 | ||
242 | status = i2c_get_status(dev); | 242 | status = i2c_get_status(dev); |
243 | if (!i2c_is_idle(status)) | 243 | if (!i2c_is_idle(status)) |
244 | if (!i2c_reset(dev)) | 244 | if (!i2c_reset(dev)) |
245 | return -EIO; | 245 | return -EIO; |
@@ -296,7 +296,7 @@ static int saa7134_i2c_xfer(struct i2c_adapter *i2c_adap, | |||
296 | rc = -EIO; | 296 | rc = -EIO; |
297 | if (!i2c_is_busy_wait(dev)) | 297 | if (!i2c_is_busy_wait(dev)) |
298 | goto err; | 298 | goto err; |
299 | status = i2c_get_status(dev); | 299 | status = i2c_get_status(dev); |
300 | if (i2c_is_error(status)) | 300 | if (i2c_is_error(status)) |
301 | goto err; | 301 | goto err; |
302 | /* ensure that the bus is idle for at least one bit slot */ | 302 | /* ensure that the bus is idle for at least one bit slot */ |
@@ -348,12 +348,12 @@ static int attach_inform(struct i2c_client *client) | |||
348 | 348 | ||
349 | client->driver->command(client, TUNER_SET_TYPE_ADDR, &tun_setup); | 349 | client->driver->command(client, TUNER_SET_TYPE_ADDR, &tun_setup); |
350 | } | 350 | } |
351 | } | 351 | } |
352 | 352 | ||
353 | if (tuner != UNSET) { | 353 | if (tuner != UNSET) { |
354 | 354 | ||
355 | tun_setup.type = tuner; | 355 | tun_setup.type = tuner; |
356 | tun_setup.addr = saa7134_boards[dev->board].tuner_addr; | 356 | tun_setup.addr = saa7134_boards[dev->board].tuner_addr; |
357 | 357 | ||
358 | if ((tun_setup.addr == ADDR_UNSET)||(tun_setup.addr == client->addr)) { | 358 | if ((tun_setup.addr == ADDR_UNSET)||(tun_setup.addr == client->addr)) { |
359 | 359 | ||
@@ -361,11 +361,11 @@ static int attach_inform(struct i2c_client *client) | |||
361 | 361 | ||
362 | client->driver->command(client,TUNER_SET_TYPE_ADDR, &tun_setup); | 362 | client->driver->command(client,TUNER_SET_TYPE_ADDR, &tun_setup); |
363 | } | 363 | } |
364 | } | 364 | } |
365 | 365 | ||
366 | client->driver->command(client, TDA9887_SET_CONFIG, &conf); | 366 | client->driver->command(client, TDA9887_SET_CONFIG, &conf); |
367 | 367 | ||
368 | return 0; | 368 | return 0; |
369 | } | 369 | } |
370 | 370 | ||
371 | static struct i2c_algorithm saa7134_algo = { | 371 | static struct i2c_algorithm saa7134_algo = { |