---

yaml --- r: 114057 b: refs/heads/master c: 3145b8c h: refs/heads/master i: 114055: 547beb4 v: v3
git-mirror · Oct 12, 2008 · 92666ff · 92666ff
1 parent 7d99b22
commit 92666ff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79a9098ae47119fad54a3443e358f08e30b7d3a5
+refs/heads/master: 3145b8c1bfb96b02abf63dcd83ec7517c22cb574
diff --git a/trunk/drivers/media/video/gspca/gspca.c b/trunk/drivers/media/video/gspca/gspca.c
@@ -1903,17 +1903,12 @@ void gspca_disconnect(struct usb_interface *intf)
 
 	usb_set_intfdata(intf, NULL);
 
-	gspca_dev->present = 0;
-	mutex_lock(&gspca_dev->queue_lock);
-	mutex_lock(&gspca_dev->usb_lock);
-	gspca_dev->streaming = 0;
-	destroy_urbs(gspca_dev);
-	mutex_unlock(&gspca_dev->usb_lock);
-	mutex_unlock(&gspca_dev->queue_lock);
-
 /* We don't want people trying to open up the device */
 	video_unregister_device(&gspca_dev->vdev);
 
+	gspca_dev->present = 0;
+	gspca_dev->streaming = 0;
+
 	kref_put(&gspca_dev->kref, gspca_delete);
 
 	PDEBUG(D_PROBE, "disconnect complete");