diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2009-12-07 18:36:35 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 18:36:35 +0100 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/media/video/cx231xx | |
| parent | Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
| parent | tree-wide: fix misspelling of "definition" in comments (diff) | |
| download | linux-dev-d014d043869cdc591f3a33243d3481fa4479c2d0.tar.xz linux-dev-d014d043869cdc591f3a33243d3481fa4479c2d0.zip | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/media/video/cx231xx')
| -rw-r--r-- | drivers/media/video/cx231xx/cx231xx-avcore.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-avcore.c b/drivers/media/video/cx231xx/cx231xx-avcore.c index 28f48f41f218..c2174413ab29 100644 --- a/drivers/media/video/cx231xx/cx231xx-avcore.c +++ b/drivers/media/video/cx231xx/cx231xx-avcore.c @@ -2414,9 +2414,11 @@ int cx231xx_gpio_i2c_read_ack(struct cx231xx *dev) cx231xx_info("No ACK after %d msec -GPIO I2C failed!", nInit * 10); - /* readAck - throuth clock stretch ,slave has given a SCL signal, - so the SDA data can be directly read. */ + /* + * readAck + * through clock stretch, slave has given a SCL signal, + * so the SDA data can be directly read. + */ status = cx231xx_get_gpio_bit(dev, dev->gpio_dir, (u8 *)&dev->gpio_val); if ((dev->gpio_val & 1 << dev->board.tuner_sda_gpio) == 0) { |