From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 20 Jan 2015 07:55:06 +0000 (+0100)
Subject: ALSA: line6/toneport: Fix wrong argument for toneport_has_led()
X-Git-Tag: v4.0-rc1~129^2~35^2~25
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=bf115fcf957f080a1766bb785e23980c1440d06e;p=linux.git

ALSA: line6/toneport: Fix wrong argument for toneport_has_led()

Tested-by: Chris Rorvick <chris@rorvick.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/usb/line6/toneport.c b/sound/usb/line6/toneport.c
index fb6d5e1e2ade..9a4f5403569e 100644
--- a/sound/usb/line6/toneport.c
+++ b/sound/usb/line6/toneport.c
@@ -370,13 +370,11 @@ static void toneport_setup(struct usb_line6_toneport *toneport)
 static void line6_toneport_disconnect(struct usb_interface *interface)
 {
 	struct usb_line6_toneport *toneport;
-	u16 idProduct;
 
 	toneport = usb_get_intfdata(interface);
 	del_timer_sync(&toneport->timer);
-	idProduct = le16_to_cpu(toneport->line6.usbdev->descriptor.idProduct);
 
-	if (toneport_has_led(idProduct)) {
+	if (toneport_has_led(toneport->type)) {
 		device_remove_file(&interface->dev, &dev_attr_led_red);
 		device_remove_file(&interface->dev, &dev_attr_led_green);
 	}