V4L/DVB (13184): gspca: Don't forget to resubmit URB's in case of an error
authorHans de Goede <hdegoede@redhat.com>
Fri, 23 Oct 2009 09:56:06 +0000 (06:56 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 5 Dec 2009 20:40:47 +0000 (18:40 -0200)
The gscpa core was not resubmitting URB's when the URB status was an error,
this means we will loose URB's (potentially all stopping the stream) in
case of sporadic USB issues. I've seen this with an Aiptek stv0680 based
PenCam connected through an USB 2.0 hub.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/gspca/gspca.c

index ebaa2425fb50214ae3cb58eba7e7ab4dc8c942b9..3298e33c7822722f9894af88337832632e77a313 100644 (file)
@@ -138,7 +138,7 @@ static void fill_frame(struct gspca_dev *gspca_dev,
                if (!gspca_dev->frozen)
 #endif
                        PDEBUG(D_ERR|D_PACK, "urb status: %d", urb->status);
-               return;
+               goto resubmit;
        }
        pkt_scan = gspca_dev->sd_desc->pkt_scan;
        for (i = 0; i < urb->number_of_packets; i++) {
@@ -174,6 +174,7 @@ static void fill_frame(struct gspca_dev *gspca_dev,
                pkt_scan(gspca_dev, frame, data, len);
        }
 
+resubmit:
        /* resubmit the URB */
        st = usb_submit_urb(urb, GFP_ATOMIC);
        if (st < 0)
@@ -220,7 +221,7 @@ static void bulk_irq(struct urb *urb)
                if (!gspca_dev->frozen)
 #endif
                        PDEBUG(D_ERR|D_PACK, "urb status: %d", urb->status);
-               return;
+               goto resubmit;
        }
 
        /* check the availability of the frame buffer */
@@ -235,6 +236,7 @@ static void bulk_irq(struct urb *urb)
                                        urb->actual_length);
        }
 
+resubmit:
        /* resubmit the URB */
        if (gspca_dev->cam.bulk_nurbs != 0) {
                st = usb_submit_urb(urb, GFP_ATOMIC);