summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/em28xx/em28xx-cards.c
diff options
context:
space:
mode:
authorFrank Schaefer <fschaefer.oss@googlemail.com>2014-01-12 17:24:20 +0100
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-01-14 17:31:32 +0100
commit23e8642cc48171151cc89a33eb84c929dcdf2c19 (patch)
tree6bdb60c2c925831c2f7cfd8b8747d877f1d16338 /drivers/media/usb/em28xx/em28xx-cards.c
parent[media] em28xx: move usb buffer pre-allocation and transfer uninit from the c... (diff)
downloadlinux-23e8642cc48171151cc89a33eb84c929dcdf2c19.tar.xz
linux-23e8642cc48171151cc89a33eb84c929dcdf2c19.zip
[media] em28xx: move usb transfer uninit on device disconnect from the core to the v4l-extension
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/usb/em28xx/em28xx-cards.c')
-rw-r--r--drivers/media/usb/em28xx/em28xx-cards.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index 7ae6e502da66..ecf92d4cde4f 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -3391,12 +3391,10 @@ static void em28xx_usb_disconnect(struct usb_interface *interface)
v4l2_device_disconnect(&dev->v4l2_dev);
- if (dev->users) {
+ if (dev->users)
em28xx_warn("device %s is open! Deregistration and memory deallocation are deferred on close.\n",
video_device_node_name(dev->vdev));
- em28xx_uninit_usb_xfer(dev, EM28XX_ANALOG_MODE);
- }
mutex_unlock(&dev->lock);
em28xx_close_extension(dev);