diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-10-09 08:15:28 +0200 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-10-09 08:15:28 +0200 |
| commit | a0bbd5abf076e4b1c354f348f79bc2baf9b031b5 (patch) | |
| tree | 33f925054499baf522911842da9a64221d8217a4 /linux/drivers/media/video/gspca/gspca.c | |
| parent | 59bd3f15af822cf71839e0cfc59f5979b6e2e6c7 (diff) | |
| parent | ceadf20dadce549bd38cba5913f04e4af0db4e9c (diff) | |
| download | mediapointer-dvb-s2-a0bbd5abf076e4b1c354f348f79bc2baf9b031b5.tar.gz mediapointer-dvb-s2-a0bbd5abf076e4b1c354f348f79bc2baf9b031b5.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/gspca/gspca.c')
| -rw-r--r-- | linux/drivers/media/video/gspca/gspca.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/linux/drivers/media/video/gspca/gspca.c b/linux/drivers/media/video/gspca/gspca.c index 12e3a4360..c2ad862b6 100644 --- a/linux/drivers/media/video/gspca/gspca.c +++ b/linux/drivers/media/video/gspca/gspca.c @@ -1913,17 +1913,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"); |