From 2b6140f1016ddbc850e8030ab68957b3d76c901f Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 9 May 2012 12:11:12 -0300 Subject: [PATCH] --- yaml --- r: 306307 b: refs/heads/master c: 9a190c858cacd4b0110fefda5046ade8cd726261 h: refs/heads/master i: 306305: 48d94fb0348877daf52c9907cfaf4a6e9a8a19db 306303: dc42619954f1b4c4a52cfee97fb15a8ac980b99c v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/gspca.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 09d4298fb826..644a9fe2bb4b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a3d6e8cc0e6ddc8b3cfdeb3c979f07ed1aa528b3 +refs/heads/master: 9a190c858cacd4b0110fefda5046ade8cd726261 diff --git a/trunk/drivers/media/video/gspca/gspca.c b/trunk/drivers/media/video/gspca/gspca.c index 2687e76b0fb8..d9df30917374 100644 --- a/trunk/drivers/media/video/gspca/gspca.c +++ b/trunk/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); /*