Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 356f05fd authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Greg Kroah-Hartman
Browse files

media: gspca: Kill URBs on USB device disconnect 



[ Upstream commit 9b9ea7c2b57a0c9c3341fc6db039d1f7971a432e ]

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: default avatarEzequiel Garcia <ezequiel@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2a9331ce

drivers/media/usb/gspca/gspca.c

+3 −1
Original line number Diff line number Diff line
@@ -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;
@@ -1630,6 +1630,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);