diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:31:58 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:31:58 -0400 |
| commit | 9e165acf1b9e37af7c0fa39399b43d0bd8600039 (patch) | |
| tree | 7ffdb0ad4c35ac9c19c4096b4f22ccc9b1eeefad /drivers/media/video/ov511.c | |
| parent | 6a4690c22f5da1eb1c898b61b6a80da52fbd976f (diff) | |
| parent | 791ccf2e4deeea8426b389fd0f5bb0e9167bb75d (diff) | |
Merge branch 'at91' into devel
Diffstat (limited to 'drivers/media/video/ov511.c')
| -rw-r--r-- | drivers/media/video/ov511.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/video/ov511.c b/drivers/media/video/ov511.c index 9edaca4371d7..3d3c48db45d9 100644 --- a/drivers/media/video/ov511.c +++ b/drivers/media/video/ov511.c | |||
| @@ -626,9 +626,9 @@ ov511_i2c_write_internal(struct usb_ov511 *ov, | |||
| 626 | break; | 626 | break; |
| 627 | 627 | ||
| 628 | /* Retry until idle */ | 628 | /* Retry until idle */ |
| 629 | do | 629 | do { |
| 630 | rc = reg_r(ov, R511_I2C_CTL); | 630 | rc = reg_r(ov, R511_I2C_CTL); |
| 631 | while (rc > 0 && ((rc&1) == 0)); | 631 | } while (rc > 0 && ((rc&1) == 0)); |
| 632 | if (rc < 0) | 632 | if (rc < 0) |
| 633 | break; | 633 | break; |
| 634 | 634 | ||
| @@ -703,9 +703,9 @@ ov511_i2c_read_internal(struct usb_ov511 *ov, unsigned char reg) | |||
| 703 | return rc; | 703 | return rc; |
| 704 | 704 | ||
| 705 | /* Retry until idle */ | 705 | /* Retry until idle */ |
| 706 | do | 706 | do { |
| 707 | rc = reg_r(ov, R511_I2C_CTL); | 707 | rc = reg_r(ov, R511_I2C_CTL); |
| 708 | while (rc > 0 && ((rc&1) == 0)); | 708 | } while (rc > 0 && ((rc & 1) == 0)); |
| 709 | if (rc < 0) | 709 | if (rc < 0) |
| 710 | return rc; | 710 | return rc; |
| 711 | 711 | ||
| @@ -729,9 +729,9 @@ ov511_i2c_read_internal(struct usb_ov511 *ov, unsigned char reg) | |||
| 729 | return rc; | 729 | return rc; |
| 730 | 730 | ||
| 731 | /* Retry until idle */ | 731 | /* Retry until idle */ |
| 732 | do | 732 | do { |
| 733 | rc = reg_r(ov, R511_I2C_CTL); | 733 | rc = reg_r(ov, R511_I2C_CTL); |
| 734 | while (rc > 0 && ((rc&1) == 0)); | 734 | } while (rc > 0 && ((rc&1) == 0)); |
| 735 | if (rc < 0) | 735 | if (rc < 0) |
| 736 | return rc; | 736 | return rc; |
| 737 | 737 | ||