diff mbox

[7/7] em28xx: Fix usb diconnect logic

Message ID 1389567649-26838-8-git-send-email-m.chehab@samsung.com (mailing list archive)
State New, archived
Headers show

Commit Message

Mauro Carvalho Chehab Jan. 12, 2014, 11 p.m. UTC
Now that everything is extension, the usb disconnect logic should
be the same.

While here, fix the device name.

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
---
 drivers/media/usb/em28xx/em28xx-cards.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Comments

Frank Schäfer Jan. 13, 2014, 6:53 p.m. UTC | #1
On 13.01.2014 00:00, Mauro Carvalho Chehab wrote:
> Now that everything is extension, the usb disconnect logic should
> be the same.
>
> While here, fix the device name.
>
> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
> ---
>   drivers/media/usb/em28xx/em28xx-cards.c | 7 +------
>   1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
> index df92f417634a..8fc0a437054e 100644
> --- a/drivers/media/usb/em28xx/em28xx-cards.c
> +++ b/drivers/media/usb/em28xx/em28xx-cards.c
> @@ -3384,12 +3384,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);
Great.
I noticed this buggy section but finally forgot to remove it.

Reviewed-by: Frank Schäfer <fschaefer.oss@googlemail.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index df92f417634a..8fc0a437054e 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -3384,12 +3384,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);