aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-10-05 03:22:10 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-12 07:37:15 -0400
commit3145b8c1bfb96b02abf63dcd83ec7517c22cb574 (patch)
tree27f218da8816b5ee6fff7c8a4ec8614d948450a0 /drivers
parent79a9098ae47119fad54a3443e358f08e30b7d3a5 (diff)
V4L/DVB (9119): gspca: Don't destroy the URBs on disconnect.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-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 9db3d899aa61..c21af312ee7c 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)
1903 1903
1904 usb_set_intfdata(intf, NULL); 1904 usb_set_intfdata(intf, NULL);
1905 1905
1906 gspca_dev->present = 0;
1907 mutex_lock(&gspca_dev->queue_lock);
1908 mutex_lock(&gspca_dev->usb_lock);
1909 gspca_dev->streaming = 0;
1910 destroy_urbs(gspca_dev);
1911 mutex_unlock(&gspca_dev->usb_lock);
1912 mutex_unlock(&gspca_dev->queue_lock);
1913
1914/* We don't want people trying to open up the device */ 1906/* We don't want people trying to open up the device */
1915 video_unregister_device(&gspca_dev->vdev); 1907 video_unregister_device(&gspca_dev->vdev);
1916 1908
1909 gspca_dev->present = 0;
1910 gspca_dev->streaming = 0;
1911
1917 kref_put(&gspca_dev->kref, gspca_delete); 1912 kref_put(&gspca_dev->kref, gspca_delete);
1918 1913
1919 PDEBUG(D_PROBE, "disconnect complete"); 1914 PDEBUG(D_PROBE, "disconnect complete");