Signed-off-by: Frank Schäfer <[email protected]>
---
drivers/media/usb/em28xx/em28xx-cards.c | 10 ----------
drivers/media/usb/em28xx/em28xx-video.c | 5 +++++
2 Dateien geändert, 5 Zeilen hinzugefügt(+), 10 Zeilen entfernt(-)
diff --git a/drivers/media/usb/em28xx/em28xx-cards.c
b/drivers/media/usb/em28xx/em28xx-cards.c
index e0040f8..34ff918b 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -3338,16 +3338,6 @@ static void em28xx_usb_disconnect(struct usb_interface
*interface)
flush_request_modules(dev);
- mutex_lock(&dev->lock);
-
- v4l2_device_disconnect(&dev->v4l2_dev);
-
- if (dev->users)
- em28xx_warn("device %s is open! Deregistration and memory
deallocation are deferred on close.\n",
- video_device_node_name(dev->vdev));
-
- mutex_unlock(&dev->lock);
-
em28xx_close_extension(dev);
/* NOTE: must be called BEFORE the resources are released */
diff --git a/drivers/media/usb/em28xx/em28xx-video.c
b/drivers/media/usb/em28xx/em28xx-video.c
index 634e88a..7535762 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;
}
+ v4l2_device_disconnect(&dev->v4l2_dev);
+
em28xx_uninit_usb_xfer(dev, EM28XX_ANALOG_MODE);
if (dev->radio_dev) {
@@ -1921,6 +1923,9 @@ static int em28xx_v4l2_fini(struct em28xx *dev)
dev->vdev = NULL;
}
+ if (dev->users)
+ em28xx_warn("Device is open ! Deregistration and memory
deallocation are deferred on close.\n");
+
return 0;
}
--
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
