From 4f21dda4a59964fab00c06cfc2b2c5d85c31fcba Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sat, 14 Mar 2009 12:27:01 -0300 Subject: [PATCH] --- yaml --- r: 138182 b: refs/heads/master c: f1ba28c3a6e472742cbd73b05b807684e5d56b5a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/usbvision/usbvision-video.c | 2 ++ trunk/drivers/media/video/w9968cf.c | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b31de7de5b09..c3e444c59fb6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae6cfaace120f4330715b56265ce0e4a710e1276 +refs/heads/master: f1ba28c3a6e472742cbd73b05b807684e5d56b5a diff --git a/trunk/drivers/media/video/usbvision/usbvision-video.c b/trunk/drivers/media/video/usbvision/usbvision-video.c index 3d400e4b7a27..74a7652dee43 100644 --- a/trunk/drivers/media/video/usbvision/usbvision-video.c +++ b/trunk/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/trunk/drivers/media/video/w9968cf.c b/trunk/drivers/media/video/w9968cf.c index 2a25580a4b66..3b08bc4af909 100644 --- a/trunk/drivers/media/video/w9968cf.c +++ b/trunk/drivers/media/video/w9968cf.c @@ -3557,7 +3557,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);