From: Jean-Francois Moine <moinejf@free.fr>
Date: Tue, 18 Nov 2008 07:19:52 +0000 (-0300)
Subject: V4L/DVB (9688): gspca: Reset the bulk URB status before resubmitting at irq level.
X-Git-Tag: v2.6.29-rc1~556^2~356
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=880ae24d35d357037d5ad5c3148383fde1070a12;p=karo-tx-linux.git

V4L/DVB (9688): gspca: Reset the bulk URB status before resubmitting at irq level.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index a9a4a5fe4b13..1da7a5c6a9a3 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -173,7 +173,6 @@ static void fill_frame(struct gspca_dev *gspca_dev,
 	}
 
 	/* resubmit the URB */
-	urb->status = 0;
 	st = usb_submit_urb(urb, GFP_ATOMIC);
 	if (st < 0)
 		PDEBUG(D_ERR|D_PACK, "usb_submit_urb() ret %d", st);
@@ -208,7 +207,13 @@ static void bulk_irq(struct urb *urb
 	PDEBUG(D_PACK, "bulk irq");
 	if (!gspca_dev->streaming)
 		return;
-	if (urb->status != 0 && urb->status != -ECONNRESET) {
+	switch (urb->status) {
+	case 0:
+		break;
+	case -ECONNRESET:
+		urb->status = 0;
+		break;
+	default:
 #ifdef CONFIG_PM
 		if (!gspca_dev->frozen)
 #endif