aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Rorvick <chris@rorvick.com>2015-01-20 03:20:48 -0500
committerTakashi Iwai <tiwai@suse.de>2015-01-20 03:52:20 -0500
commit35ae48a3f40cff8a418b4f2061de3e2bc432e663 (patch)
tree9387d246ca270ef1786c52855563f8f21d20ac81
parent4d79fb1ed2487f204a185b59895e9a92ac4b475a (diff)
ALSA: line6: Remove superfluous NULL checks
Signed-off-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/usb/line6/driver.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c
index a3da18b876d1..3757b0c03054 100644
--- a/sound/usb/line6/driver.c
+++ b/sound/usb/line6/driver.c
@@ -456,21 +456,11 @@ int line6_probe(struct usb_interface *interface,
456 const struct line6_properties *properties, 456 const struct line6_properties *properties,
457 int (*private_init)(struct usb_interface *, struct usb_line6 *)) 457 int (*private_init)(struct usb_interface *, struct usb_line6 *))
458{ 458{
459 struct usb_device *usbdev; 459 struct usb_device *usbdev = interface_to_usbdev(interface);
460 struct snd_card *card; 460 struct snd_card *card;
461 int interface_number; 461 int interface_number;
462 int ret; 462 int ret;
463 463
464 if (!interface) {
465 ret = -ENODEV;
466 goto err_put;
467 }
468 usbdev = interface_to_usbdev(interface);
469 if (!usbdev) {
470 ret = -ENODEV;
471 goto err_put;
472 }
473
474 /* we don't handle multiple configurations */ 464 /* we don't handle multiple configurations */
475 if (usbdev->descriptor.bNumConfigurations != 1) { 465 if (usbdev->descriptor.bNumConfigurations != 1) {
476 ret = -ENODEV; 466 ret = -ENODEV;