From 6e0a3ff369759e4f19ffdd88399fd2f25613a4c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Moine?= Date: Fri, 23 Sep 2011 04:15:50 -0300 Subject: [PATCH] --- yaml --- r: 271902 b: refs/heads/master c: 9ba4a4ba3c170e618f75213fb03fe2deda754195 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/spca1528.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 57e0f474d7c9..2dff76de8a0e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f12b1ab2fac0edbc5d8ad64f962fe40662c5b72 +refs/heads/master: 9ba4a4ba3c170e618f75213fb03fe2deda754195 diff --git a/trunk/drivers/media/video/gspca/spca1528.c b/trunk/drivers/media/video/gspca/spca1528.c index 4131be5df53f..565c2f1bdfea 100644 --- a/trunk/drivers/media/video/gspca/spca1528.c +++ b/trunk/drivers/media/video/gspca/spca1528.c @@ -226,14 +226,16 @@ static void reg_wb(struct gspca_dev *gspca_dev, static void wait_status_0(struct gspca_dev *gspca_dev) { - int i; + int i, w; - i = 20; + i = 16; + w = 0; do { reg_r(gspca_dev, 0x21, 0x0000, 1); if (gspca_dev->usb_buf[0] == 0) return; - msleep(30); + w += 15; + msleep(w); } while (--i > 0); PDEBUG(D_ERR, "wait_status_0 timeout"); gspca_dev->usb_err = -ETIME;