OSDN Git Service

media: gspca: Kill URBs on USB device disconnect
authorEzequiel Garcia <ezequiel@collabora.com>
Thu, 28 Feb 2019 15:28:34 +0000 (10:28 -0500)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Fri, 29 Mar 2019 11:34:32 +0000 (07:34 -0400)
In order to prevent ISOC URBs from being infinitely resubmitted,
the driver's USB disconnect handler must kill all the in-flight URBs.

While here, change the URB packet status message to a debug level,
to avoid spamming the console too much.

This commit fixes a lockup caused by an interrupt storm coming
from the URB completion handler.

Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/usb/gspca/gspca.c

index 9448ac0..4d75174 100644 (file)
@@ -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;
@@ -1642,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);