diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-03-14 11:27:01 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:43:23 -0400 |
commit | f1ba28c3a6e472742cbd73b05b807684e5d56b5a (patch) | |
tree | 41db21f9bb32ac3e77069639628245d00dad0f23 /drivers | |
parent | ae6cfaace120f4330715b56265ce0e4a710e1276 (diff) |
V4L/DVB (11045): v4l2: call v4l2_device_disconnect in USB drivers.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/usbvision/usbvision-video.c | 2 | ||||
-rw-r--r-- | drivers/media/video/w9968cf.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c index 3d400e4b7a27..74a7652dee43 100644 --- a/drivers/media/video/usbvision/usbvision-video.c +++ b/drivers/media/video/usbvision/usbvision-video.c | |||
@@ -1771,6 +1771,8 @@ static void __devexit usbvision_disconnect(struct usb_interface *intf) | |||
1771 | // At this time we ask to cancel outstanding URBs | 1771 | // At this time we ask to cancel outstanding URBs |
1772 | usbvision_stop_isoc(usbvision); | 1772 | usbvision_stop_isoc(usbvision); |
1773 | 1773 | ||
1774 | v4l2_device_disconnect(&usbvision->v4l2_dev); | ||
1775 | |||
1774 | if (usbvision->power) { | 1776 | if (usbvision->power) { |
1775 | usbvision_i2c_unregister(usbvision); | 1777 | usbvision_i2c_unregister(usbvision); |
1776 | usbvision_power_off(usbvision); | 1778 | usbvision_power_off(usbvision); |
diff --git a/drivers/media/video/w9968cf.c b/drivers/media/video/w9968cf.c index 2a25580a4b66..3b08bc4af909 100644 --- a/drivers/media/video/w9968cf.c +++ b/drivers/media/video/w9968cf.c | |||
@@ -3557,7 +3557,9 @@ static void w9968cf_usb_disconnect(struct usb_interface* intf) | |||
3557 | 3557 | ||
3558 | cam->disconnected = 1; | 3558 | cam->disconnected = 1; |
3559 | 3559 | ||
3560 | DBG(2, "Disconnecting %s...", symbolic(camlist, cam->id)) | 3560 | DBG(2, "Disconnecting %s...", symbolic(camlist, cam->id)); |
3561 | |||
3562 | v4l2_device_disconnect(&cam->v4l2_dev); | ||
3561 | 3563 | ||
3562 | wake_up_interruptible_all(&cam->open); | 3564 | wake_up_interruptible_all(&cam->open); |
3563 | 3565 | ||