From 0941e38c05add02b049a89049f27ab7feea7b9e5 Mon Sep 17 00:00:00 2001
From: Jean-Francois Moine <moinejf@free.fr>
Date: Mon, 8 Sep 2008 03:22:42 -0300
Subject: [PATCH] --- yaml --- r: 113915 b: refs/heads/master c:
 51977a8daab6775b91986b566056eb2a2f10202d h: refs/heads/master i:   113913:
 52bdaf00d0bfb9c886cc8cf0017933c998af100f   113911:
 2c9e1ee37385a098b61548aa7f8fdc88c72f2fa4 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/media/video/gspca/gspca.c | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index c47b969f7eb2..71a0560e9710 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b537391dde35d7f412417a95f02f89af08dd2d3
+refs/heads/master: 51977a8daab6775b91986b566056eb2a2f10202d
diff --git a/trunk/drivers/media/video/gspca/gspca.c b/trunk/drivers/media/video/gspca/gspca.c
index ce5498527fc2..58761d9809f7 100644
--- a/trunk/drivers/media/video/gspca/gspca.c
+++ b/trunk/drivers/media/video/gspca/gspca.c
@@ -185,7 +185,7 @@ static void bulk_irq(struct urb *urb
 {
 	struct gspca_dev *gspca_dev = (struct gspca_dev *) urb->context;
 	struct gspca_frame *frame;
-	int j, ret;
+	int j;
 
 	PDEBUG(D_PACK, "bulk irq");
 	if (!gspca_dev->streaming)
@@ -212,11 +212,6 @@ static void bulk_irq(struct urb *urb
 					urb->transfer_buffer,
 					urb->actual_length);
 	}
-	/* resubmit the URB */
-	urb->status = 0;
-	ret = usb_submit_urb(urb, GFP_ATOMIC);
-	if (ret < 0)
-		PDEBUG(D_ERR|D_PACK, "usb_submit_urb() ret %d", ret);
 }
 
 /*
@@ -502,13 +497,14 @@ static int create_urbs(struct gspca_dev *gspca_dev,
 		PDEBUG(D_STREAM,
 			"isoc %d pkts size %d = bsize:%d",
 			npkt, psize, bsize);
+		nurbs = DEF_NURBS;
 	} else {
 		npkt = 0;
 		bsize = psize;
 		PDEBUG(D_STREAM, "bulk bsize:%d", bsize);
+		nurbs = 1;
 	}
 
-	nurbs = DEF_NURBS;
 	gspca_dev->nurbs = nurbs;
 	for (n = 0; n < nurbs; n++) {
 		urb = usb_alloc_urb(npkt, GFP_KERNEL);
@@ -583,6 +579,10 @@ static int gspca_init_transfer(struct gspca_dev *gspca_dev)
 		gspca_dev->streaming = 1;
 		atomic_set(&gspca_dev->nevent, 0);
 
+		/* start the bulk transfer is done by the subdriver */
+		if (gspca_dev->bulk)
+			break;
+
 		/* submit the URBs */
 		for (n = 0; n < gspca_dev->nurbs; n++) {
 			ret = usb_submit_urb(gspca_dev->urb[n], GFP_KERNEL);