---

yaml --- r: 109567 b: refs/heads/master c: 1e89e2d h: refs/heads/master i: 109565: 9d98ad5 109563: 881eef6 109559: 8274859 109551: d0cbb6d 109535: bbda964 109503: 00be7dd 109439: 7ae2b0c 109311: ab708d2 109055: d9ee509 108543: b556ed9 v: v3
git-mirror · Sep 3, 2008 · f2cb472 · f2cb472
1 parent b315668
commit f2cb472
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65f33396ab57f3346fb07ddee8e3aa616d13386c
+refs/heads/master: 1e89e2da48070da8ac221c37fea8fa82da127c34
diff --git a/trunk/drivers/media/video/gspca/gspca.c b/trunk/drivers/media/video/gspca/gspca.c
@@ -1838,9 +1838,12 @@ int gspca_resume(struct usb_interface *intf)
 	struct gspca_dev *gspca_dev = usb_get_intfdata(intf);
 
 	gspca_dev->frozen = 0;
-	if (!gspca_dev->streaming)
-		return 0;
-	return gspca_init_transfer(gspca_dev);
+	if (gspca_dev->users != 0) {
+		gspca_dev->sd_desc->open(gspca_dev);
+		if (gspca_dev->streaming)
+			return gspca_init_transfer(gspca_dev);
+	}
+	return 0;
 }
 EXPORT_SYMBOL(gspca_resume);
 #endif