summaryrefslogtreecommitdiffstats
path: root/sound/usb/line6
diff options
context:
space:
mode:
authorTakashi Iwai2015-01-20 08:40:51 +0100
committerTakashi Iwai2015-01-28 07:18:04 +0100
commit270fd9c7f91fe8be900ede740ceeaa4abefa5d98 (patch)
tree784fb7abefea5a6540aa94200387502d01cb8300 /sound/usb/line6
parentALSA: line6: Remove driver version from header comment (diff)
downloadkernel-qcow2-linux-270fd9c7f91fe8be900ede740ceeaa4abefa5d98.tar.gz
kernel-qcow2-linux-270fd9c7f91fe8be900ede740ceeaa4abefa5d98.tar.xz
kernel-qcow2-linux-270fd9c7f91fe8be900ede740ceeaa4abefa5d98.zip
ALSA: line6: Yet more cleanup of superfluous NULL checks
... in line6_disconnect() as well. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/line6')
-rw-r--r--sound/usb/line6/driver.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c
index 93cd4daa56bc..e8d51381ffdb 100644
--- a/sound/usb/line6/driver.c
+++ b/sound/usb/line6/driver.c
@@ -579,18 +579,9 @@ EXPORT_SYMBOL_GPL(line6_probe);
*/
void line6_disconnect(struct usb_interface *interface)
{
- struct usb_line6 *line6;
- struct usb_device *usbdev;
- int interface_number;
-
- if (interface == NULL)
- return;
- usbdev = interface_to_usbdev(interface);
- if (usbdev == NULL)
- return;
+ struct usb_line6 *line6 = usb_get_intfdata(interface);
+ struct usb_device *usbdev = interface_to_usbdev(interface);
- interface_number = interface->cur_altsetting->desc.bInterfaceNumber;
- line6 = usb_get_intfdata(interface);
if (!line6)
return;