---

yaml --- r: 306307 b: refs/heads/master c: 9a190c8 h: refs/heads/master i: 306305: 48d94fb 306303: dc42619 v: v3
git-mirror · May 14, 2012 · 2b6140f · 2b6140f
1 parent ee954e6
commit 2b6140f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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);
 	/*