summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorFrank Schaefer <fschaefer.oss@googlemail.com>2014-01-12 13:24:20 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-01-14 14:31:32 -0200
commit23e8642cc48171151cc89a33eb84c929dcdf2c19 (patch)
tree6bdb60c2c925831c2f7cfd8b8747d877f1d16338 /drivers/media
parent27ba0dac2d31d91a017d96cbe95e4a98d3670d2d (diff)
[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')
-rw-r--r--drivers/media/usb/em28xx/em28xx-cards.c4
-rw-r--r--drivers/media/usb/em28xx/em28xx-video.c2
2 files changed, 3 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);
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index efbc877c6181..a5a665b41060 100644
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -1893,6 +1893,8 @@ static int em28xx_v4l2_fini(struct em28xx *dev)
return 0;
}
+ em28xx_uninit_usb_xfer(dev, EM28XX_ANALOG_MODE);
+
if (dev->radio_dev) {
if (video_is_registered(dev->radio_dev))
video_unregister_device(dev->radio_dev);