summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <m.chehab@samsung.com>2014-01-12 22:44:23 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-01-14 14:38:53 -0200
commit6582af4c018afd222596d6244b6d685182035c75 (patch)
tree9b0bd0a3e9047431a86d0a34080e201c9951f22d /drivers/media
parentaa929ad783c0762f276c8c810f1c7f00b12dca4a (diff)
downloadblackbird-op-linux-6582af4c018afd222596d6244b6d685182035c75.tar.gz
blackbird-op-linux-6582af4c018afd222596d6244b6d685182035c75.zip
[media] em28xx: Fix usb diconnect logic
Now that everything is extension, the usb disconnect logic should be the same. While here, fix the device name. Reviewed-by: Frank Schäfer <fschaefer.oss@googlemail.com> Tested-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/usb/em28xx/em28xx-cards.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index 3b332d527ccb..e08d65b2e352 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -3379,12 +3379,7 @@ static void em28xx_usb_disconnect(struct usb_interface *interface)
dev->disconnected = 1;
- if (dev->is_audio_only) {
- em28xx_close_extension(dev);
- return;
- }
-
- em28xx_info("disconnecting %s\n", dev->vdev->name);
+ em28xx_info("Disconnecting %s\n", dev->name);
flush_request_modules(dev);
OpenPOWER on IntegriCloud