aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/video4linux/gspca.txt3
-rw-r--r--drivers/media/video/gspca/gspca.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt
index 2a23fe31e0ef..4c96adc0ba5b 100644
--- a/Documentation/video4linux/gspca.txt
+++ b/Documentation/video4linux/gspca.txt
@@ -169,6 +169,8 @@ spca500 06bd:0404 Agfa CL20
169spca500 06be:0800 Optimedia 169spca500 06be:0800 Optimedia
170sunplus 06d6:0031 Trust 610 LCD PowerC@m Zoom 170sunplus 06d6:0031 Trust 610 LCD PowerC@m Zoom
171spca506 06e1:a190 ADS Instant VCD 171spca506 06e1:a190 ADS Instant VCD
172ov534 06f8:3002 Hercules Blog Webcam
173ov534 06f8:3003 Hercules Dualpix HD Weblog
172spca508 0733:0110 ViewQuest VQ110 174spca508 0733:0110 ViewQuest VQ110
173spca508 0130:0130 Clone Digital Webcam 11043 175spca508 0130:0130 Clone Digital Webcam 11043
174spca501 0733:0401 Intel Create and Share 176spca501 0733:0401 Intel Create and Share
@@ -263,6 +265,7 @@ etoms 102c:6251 Qcam xxxxxx VGA
263zc3xx 10fd:0128 Typhoon Webshot II USB 300k 0x0128 265zc3xx 10fd:0128 Typhoon Webshot II USB 300k 0x0128
264spca561 10fd:7e50 FlyCam Usb 100 266spca561 10fd:7e50 FlyCam Usb 100
265zc3xx 10fd:8050 Typhoon Webshot II USB 300k 267zc3xx 10fd:8050 Typhoon Webshot II USB 300k
268ov534 1415:2000 Sony HD Eye for PS3 (SLEH 00201)
266pac207 145f:013a Trust WB-1300N 269pac207 145f:013a Trust WB-1300N
267spca501 1776:501c Arowana 300K CMOS Camera 270spca501 1776:501c Arowana 300K CMOS Camera
268t613 17a1:0128 TASCORP JPEG Webcam, NGS Cyclops 271t613 17a1:0128 TASCORP JPEG Webcam, NGS Cyclops
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 0d233c724875..7f8b798deb1b 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -1923,6 +1923,9 @@ void gspca_disconnect(struct usb_interface *intf)
1923{ 1923{
1924 struct gspca_dev *gspca_dev = usb_get_intfdata(intf); 1924 struct gspca_dev *gspca_dev = usb_get_intfdata(intf);
1925 1925
1926 gspca_dev->present = 0;
1927 gspca_dev->streaming = 0;
1928
1926 usb_set_intfdata(intf, NULL); 1929 usb_set_intfdata(intf, NULL);
1927 1930
1928 /* release the device */ 1931 /* release the device */