summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-03-14 16:27:01 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-14 16:27:01 +0100
commit9a4b796fec5b96cb6d0f637fc86983bb376c7628 (patch)
tree4fb4d01b48da7cd6fe0e8ac9f82ea2baa322761f /linux
parent48beb6bb3e66daddf4c339f5c02710a060d3a0be (diff)
downloadmediapointer-dvb-s2-9a4b796fec5b96cb6d0f637fc86983bb376c7628.tar.gz
mediapointer-dvb-s2-9a4b796fec5b96cb6d0f637fc86983bb376c7628.tar.bz2
v4l2: call v4l2_device_disconnect in USB drivers.
From: Hans Verkuil <hverkuil@xs4all.nl> Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/video/usbvision/usbvision-video.c2
-rw-r--r--linux/drivers/media/video/w9968cf.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/linux/drivers/media/video/usbvision/usbvision-video.c b/linux/drivers/media/video/usbvision/usbvision-video.c
index 3d400e4b7..74a7652de 100644
--- a/linux/drivers/media/video/usbvision/usbvision-video.c
+++ b/linux/drivers/media/video/usbvision/usbvision-video.c
@@ -1771,6 +1771,8 @@ static void __devexit usbvision_disconnect(struct usb_interface *intf)
// At this time we ask to cancel outstanding URBs
usbvision_stop_isoc(usbvision);
+ v4l2_device_disconnect(&usbvision->v4l2_dev);
+
if (usbvision->power) {
usbvision_i2c_unregister(usbvision);
usbvision_power_off(usbvision);
diff --git a/linux/drivers/media/video/w9968cf.c b/linux/drivers/media/video/w9968cf.c
index 0478ee33e..cf8548a7f 100644
--- a/linux/drivers/media/video/w9968cf.c
+++ b/linux/drivers/media/video/w9968cf.c
@@ -3571,7 +3571,9 @@ static void w9968cf_usb_disconnect(struct usb_interface* intf)
cam->disconnected = 1;
- DBG(2, "Disconnecting %s...", symbolic(camlist, cam->id))
+ DBG(2, "Disconnecting %s...", symbolic(camlist, cam->id));
+
+ v4l2_device_disconnect(&cam->v4l2_dev);
wake_up_interruptible_all(&cam->open);