aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/video/gspca
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/gspca')
-rw-r--r--drivers/media/video/gspca/gspca.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 9db3d899aa6..c21af312ee7 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/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");