---

yaml --- r: 124247 b: refs/heads/master c: 6e4ae87 h: refs/heads/master i: 124245: 9ea5ee9 124243: a51431f 124239: e670125 v: v3
git-mirror · Dec 29, 2008 · 8e7c065 · 8e7c065
1 parent 71a18d6
commit 8e7c065
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fbb4c6d20f29f2b10daad31cc6238d91f93d70d4
+refs/heads/master: 6e4ae872c580d6a388a52ddfdfc93b4215af1180
diff --git a/trunk/Documentation/video4linux/gspca.txt b/trunk/Documentation/video4linux/gspca.txt
@@ -169,6 +169,8 @@ spca500		06bd:0404	Agfa CL20
 spca500		06be:0800	Optimedia
 sunplus		06d6:0031	Trust 610 LCD PowerC@m Zoom
 spca506		06e1:a190	ADS Instant VCD
+ov534		06f8:3002	Hercules Blog Webcam
+ov534		06f8:3003	Hercules Dualpix HD Weblog
 spca508		0733:0110	ViewQuest VQ110
 spca508		0130:0130	Clone Digital Webcam 11043
 spca501		0733:0401	Intel Create and Share
@@ -263,6 +265,7 @@ etoms		102c:6251	Qcam xxxxxx VGA
 zc3xx		10fd:0128	Typhoon Webshot II USB 300k 0x0128
 spca561		10fd:7e50	FlyCam Usb 100
 zc3xx		10fd:8050	Typhoon Webshot II USB 300k
+ov534		1415:2000	Sony HD Eye for PS3 (SLEH 00201)
 pac207		145f:013a	Trust WB-1300N
 spca501		1776:501c	Arowana 300K CMOS Camera
 t613		17a1:0128	TASCORP JPEG Webcam, NGS Cyclops

diff --git a/trunk/drivers/media/video/gspca/gspca.c b/trunk/drivers/media/video/gspca/gspca.c
@@ -1923,6 +1923,9 @@ void gspca_disconnect(struct usb_interface *intf)
 {
 	struct gspca_dev *gspca_dev = usb_get_intfdata(intf);
 
+	gspca_dev->present = 0;
+	gspca_dev->streaming = 0;
+
 	usb_set_intfdata(intf, NULL);
 
 	/* release the device */