diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-06 10:51:57 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-06 10:51:57 -0400 |
commit | 7f79d852ed30a06eebf7497afe9334a726db3d40 (patch) | |
tree | 0057281f17501b635d3d88cda9a14203706f5dcc /drivers/media/video/ov511.c | |
parent | aef745fca016aea45adae5c98e8698904dd8ad51 (diff) | |
parent | 70bb08962ea9bd50797ae9f16b2493f5f7c65053 (diff) |
Merge branch 'linus' into sched/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 | ||