From f2cb4726af51029ba9c0ca0f8bf0973b640d47e7 Mon Sep 17 00:00:00 2001
From: Jean-Francois Moine <moinejf@free.fr>
Date: Wed, 3 Sep 2008 17:12:15 -0300
Subject: [PATCH] --- yaml --- r: 109567 b: refs/heads/master c:
 1e89e2da48070da8ac221c37fea8fa82da127c34 h: refs/heads/master i:   109565:
 9d98ad5f5c738d60e966cd1619b98d38668cf4f8   109563:
 881eef6028fd4b5b7d0dc3dc104f942d3a245933   109559:
 8274859079a7a136b6b154522504686cdbc5e772   109551:
 d0cbb6d54244187237b607ca7c038cc517d09988   109535:
 bbda964e3d996eb92432e8ee6966248dd903aad6   109503:
 00be7dd28660926af2eb9e2cf39bc8ac3cdd12cf   109439:
 7ae2b0cf74feb28b7b62d2d55cbcb59b8a35ed73   109311:
 ab708d25d10113febfca1932109e3df6c63a556a   109055:
 d9ee509183f6070b7f9d39b764c18684a3c160fb   108543:
 b556ed9a0c627a1c24390bd7981ba988607a53b7 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/media/video/gspca/gspca.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 750e3669f98a..ce4385a28359 100644
--- 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
index e7e73ec7134c..1767991c1f4b 100644
--- 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