Merge tag 'pm-5.2-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[sfrench/cifs-2.6.git] / drivers / media / usb / gspca / gspca.c

diff --git a/drivers/media/usb/gspca/gspca.c b/drivers/media/usb/gspca/gspca.c
index ac70b36d67b7bf9001eb64378b7e4721a8c21d77..4d7517411cc2d6c769b8a6773528555fee14428c 100644 (file)
--- a/drivers/media/usb/gspca/gspca.c
+++ b/drivers/media/usb/gspca/gspca.c
@@ -294,7 +294,7 @@ static void fill_frame(struct gspca_dev *gspca_dev,
                /* check the packet status and length */
                st = urb->iso_frame_desc[i].status;
                if (st) {
-                       pr_err("ISOC data error: [%d] len=%d, status=%d\n",
+                       gspca_dbg(gspca_dev, D_PACK, "ISOC data error: [%d] len=%d, status=%d\n",
                               i, len, st);
                        gspca_dev->last_packet_type = DISCARD_PACKET;
                        continue;
@@ -314,6 +314,8 @@ static void fill_frame(struct gspca_dev *gspca_dev,
        }
 
 resubmit:
+       if (!gspca_dev->streaming)
+               return;
        /* resubmit the URB */
        st = usb_submit_urb(urb, GFP_ATOMIC);
        if (st < 0)
@@ -330,7 +332,7 @@ static void isoc_irq(struct urb *urb)
        struct gspca_dev *gspca_dev = (struct gspca_dev *) urb->context;
 
        gspca_dbg(gspca_dev, D_PACK, "isoc irq\n");
-       if (!vb2_start_streaming_called(&gspca_dev->queue))
+       if (!gspca_dev->streaming)
                return;
        fill_frame(gspca_dev, urb);
 }
@@ -344,7 +346,7 @@ static void bulk_irq(struct urb *urb)
        int st;
 
        gspca_dbg(gspca_dev, D_PACK, "bulk irq\n");
-       if (!vb2_start_streaming_called(&gspca_dev->queue))
+       if (!gspca_dev->streaming)
                return;
        switch (urb->status) {
        case 0:
@@ -367,6 +369,8 @@ static void bulk_irq(struct urb *urb)
                                urb->actual_length);
 
 resubmit:
+       if (!gspca_dev->streaming)
+               return;
        /* resubmit the URB */
        if (gspca_dev->cam.bulk_nurbs != 0) {
                st = usb_submit_urb(urb, GFP_ATOMIC);
@@ -1638,6 +1642,8 @@ void gspca_disconnect(struct usb_interface *intf)
 
        mutex_lock(&gspca_dev->usb_lock);
        gspca_dev->present = false;
+       destroy_urbs(gspca_dev);
+       gspca_input_destroy_urb(gspca_dev);
 
        vb2_queue_error(&gspca_dev->queue);