From: Hans de Goede Date: Wed, 9 May 2012 15:11:12 +0000 (-0300) Subject: [media] gscpa: Clear usb_err before calling sd methods from suspend/resume X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9a190c858cacd4b0110fefda5046ade8cd726261;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [media] gscpa: Clear usb_err before calling sd methods from suspend/resume Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index 2687e76b0fb8..d9df30917374 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c @@ -2392,6 +2392,7 @@ int gspca_suspend(struct usb_interface *intf, pm_message_t message) 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); @@ -2411,6 +2412,7 @@ int gspca_resume(struct usb_interface *intf) mutex_lock(&gspca_dev->usb_lock); gspca_dev->frozen = 0; + gspca_dev->usb_err = 0; gspca_dev->sd_desc->init(gspca_dev); gspca_input_create_urb(gspca_dev); /*