Signed-off-by: Frank Schäfer <[email protected]>
---
drivers/media/usb/em28xx/em28xx-cards.c | 4 +---
drivers/media/usb/em28xx/em28xx-video.c | 2 ++
2 Dateien geändert, 3 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-)
diff --git a/drivers/media/usb/em28xx/em28xx-cards.c
b/drivers/media/usb/em28xx/em28xx-cards.c
index 4d89df9..e0040f8 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -3342,12 +3342,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 83c99e6..634e88a 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);
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
