From: Mauro Carvalho Chehab <m.chehab@samsung.com>
Date: Mon, 13 Jan 2014 01:44:23 +0000 (-0300)
Subject: [media] em28xx: Fix usb diconnect logic
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=6582af4c018afd222596d6244b6d685182035c75;p=deliverable%2Flinux.git

[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>
---

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);