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

Commit 36adfca9 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

[media] gspca: Fix input urb creation / destruction surrounding suspend resume 



1) We always re-create the input-urb on resume, so we must also always
   destroy it on suspend to avoid leaking it
2) If we're going to do an init_transfer, then that will destroy the urb
   before starting the stream (nop if there is none), and (re-)create it
   once the stream is started. So there is little use in creating it, if
   we're going to do an init_transfer immediately afterward

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 844db450

drivers/media/usb/gspca/gspca.c

+7 −2
Original line number Diff line number Diff line
@@ -2391,19 +2391,22 @@ int gspca_suspend(struct usb_interface *intf, pm_message_t message) 
{

	struct gspca_dev *gspca_dev = usb_get_intfdata(intf);



	gspca_input_destroy_urb(gspca_dev);



	if (!gspca_dev->streaming)

		return 0;



	mutex_lock(&gspca_dev->usb_lock);

	gspca_dev->frozen = 1;		/* avoid urb error messages */

	gspca_dev->usb_err = 0;

	if (gspca_dev->sd_desc->stopN)

		gspca_dev->sd_desc->stopN(gspca_dev);

	destroy_urbs(gspca_dev);

	gspca_input_destroy_urb(gspca_dev);

	gspca_set_alt0(gspca_dev);

	if (gspca_dev->sd_desc->stop0)

		gspca_dev->sd_desc->stop0(gspca_dev);

	mutex_unlock(&gspca_dev->usb_lock);



	return 0;

}

EXPORT_SYMBOL(gspca_suspend);
@@ -2417,7 +2420,6 @@ int gspca_resume(struct usb_interface *intf) 
	gspca_dev->frozen = 0;

	gspca_dev->usb_err = 0;

	gspca_dev->sd_desc->init(gspca_dev);

	gspca_input_create_urb(gspca_dev);

	/*

	 * Most subdrivers send all ctrl values on sd_start and thus

	 * only write to the device registers on s_ctrl when streaming ->
@@ -2427,7 +2429,10 @@ int gspca_resume(struct usb_interface *intf) 
	gspca_dev->streaming = 0;

	if (streaming)

		ret = gspca_init_transfer(gspca_dev);

	else

		gspca_input_create_urb(gspca_dev);

	mutex_unlock(&gspca_dev->usb_lock);



	return ret;

}

EXPORT_SYMBOL(gspca_resume);