diff options
author | Li Zefan <lizf@cn.fujitsu.com> | 2008-09-02 06:02:50 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-04 17:27:51 -0400 |
commit | 8561098ff11d21f1a6a9a01fae2e68653928dbb5 (patch) | |
tree | d7b96f9b46fc9f924a52906b5f80d2e77622bb5b /drivers/media | |
parent | 748c7f80acc266a54ade4d6863229402fd3cd363 (diff) |
V4L/DVB (8881): gspca: After 'while (retry--) {...}', retry will be -1 but not 0.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/gspca/conex.c | 4 | ||||
-rw-r--r-- | drivers/media/video/gspca/spca561.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/gspca/conex.c b/drivers/media/video/gspca/conex.c index 8c91ffde9536..4d9f4cc255a9 100644 --- a/drivers/media/video/gspca/conex.c +++ b/drivers/media/video/gspca/conex.c | |||
@@ -731,13 +731,13 @@ static void cx11646_jpeg(struct gspca_dev*gspca_dev) | |||
731 | reg_w_val(gspca_dev, 0x0000, 0x00); | 731 | reg_w_val(gspca_dev, 0x0000, 0x00); |
732 | /* wait for completion */ | 732 | /* wait for completion */ |
733 | retry = 50; | 733 | retry = 50; |
734 | while (retry--) { | 734 | do { |
735 | reg_r(gspca_dev, 0x0002, 1); | 735 | reg_r(gspca_dev, 0x0002, 1); |
736 | /* 0x07 until 0x00 */ | 736 | /* 0x07 until 0x00 */ |
737 | if (gspca_dev->usb_buf[0] == 0x00) | 737 | if (gspca_dev->usb_buf[0] == 0x00) |
738 | break; | 738 | break; |
739 | reg_w_val(gspca_dev, 0x0053, 0x00); | 739 | reg_w_val(gspca_dev, 0x0053, 0x00); |
740 | } | 740 | } while (--retry); |
741 | if (retry == 0) | 741 | if (retry == 0) |
742 | PDEBUG(D_ERR, "Damned Errors sending jpeg Table"); | 742 | PDEBUG(D_ERR, "Damned Errors sending jpeg Table"); |
743 | /* send the qtable now */ | 743 | /* send the qtable now */ |
diff --git a/drivers/media/video/gspca/spca561.c b/drivers/media/video/gspca/spca561.c index 1c29c279a982..cfbc9ebc5c5d 100644 --- a/drivers/media/video/gspca/spca561.c +++ b/drivers/media/video/gspca/spca561.c | |||
@@ -223,11 +223,11 @@ static int i2c_read(struct gspca_dev *gspca_dev, __u16 reg, __u8 mode) | |||
223 | reg_w_val(gspca_dev->dev, 0x8804, 0x92); | 223 | reg_w_val(gspca_dev->dev, 0x8804, 0x92); |
224 | reg_w_val(gspca_dev->dev, 0x8801, reg); | 224 | reg_w_val(gspca_dev->dev, 0x8801, reg); |
225 | reg_w_val(gspca_dev->dev, 0x8802, (mode | 0x01)); | 225 | reg_w_val(gspca_dev->dev, 0x8802, (mode | 0x01)); |
226 | while (retry--) { | 226 | do { |
227 | reg_r(gspca_dev, 0x8803, 1); | 227 | reg_r(gspca_dev, 0x8803, 1); |
228 | if (!gspca_dev->usb_buf) | 228 | if (!gspca_dev->usb_buf) |
229 | break; | 229 | break; |
230 | } | 230 | } while (--retry); |
231 | if (retry == 0) | 231 | if (retry == 0) |
232 | return -1; | 232 | return -1; |
233 | reg_r(gspca_dev, 0x8800, 1); | 233 | reg_r(gspca_dev, 0x8800, 1); |