summaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-01-25 18:41:26 +0100
committerTakashi Iwai <tiwai@suse.de>2015-01-28 07:22:16 +0100
commitd6ca69d82522cb0e59777deea3673c85c7db7f45 (patch)
tree8d8c17684038092645cc2ff497ff2c266d703df1 /sound/usb
parentaca514b82356dcc3575da33453382bd27593aea1 (diff)
downloadlinux-d6ca69d82522cb0e59777deea3673c85c7db7f45.tar.gz
linux-d6ca69d82522cb0e59777deea3673c85c7db7f45.tar.bz2
linux-d6ca69d82522cb0e59777deea3673c85c7db7f45.zip
ALSA: line6: Minor tidy up in line6_probe()
Move the check of multi configurations before snd_card_new() as a short path, and reduce superfluous pointer references. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/line6/driver.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c
index c696f9773cbb..a0436993a167 100644
--- a/sound/usb/line6/driver.c
+++ b/sound/usb/line6/driver.c
@@ -495,6 +495,10 @@ int line6_probe(struct usb_interface *interface,
if (WARN_ON(data_size < sizeof(*line6)))
return -EINVAL;
+ /* we don't handle multiple configurations */
+ if (usbdev->descriptor.bNumConfigurations != 1)
+ return -ENODEV;
+
ret = snd_card_new(&interface->dev,
SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
THIS_MODULE, data_size, &card);
@@ -508,10 +512,10 @@ int line6_probe(struct usb_interface *interface,
line6->usbdev = usbdev;
line6->ifcdev = &interface->dev;
- strcpy(card->id, line6->properties->id);
+ strcpy(card->id, properties->id);
strcpy(card->driver, DRIVER_NAME);
- strcpy(card->shortname, line6->properties->name);
- sprintf(card->longname, "Line 6 %s at USB %s", line6->properties->name,
+ strcpy(card->shortname, properties->name);
+ sprintf(card->longname, "Line 6 %s at USB %s", properties->name,
dev_name(line6->ifcdev));
card->private_free = line6_destruct;
@@ -520,12 +524,6 @@ int line6_probe(struct usb_interface *interface,
/* increment reference counters: */
usb_get_dev(usbdev);
- /* we don't handle multiple configurations */
- if (usbdev->descriptor.bNumConfigurations != 1) {
- ret = -ENODEV;
- goto error;
- }
-
/* initialize device info: */
dev_info(&interface->dev, "Line 6 %s found\n", properties->name);
@@ -533,7 +531,7 @@ int line6_probe(struct usb_interface *interface,
interface_number = interface->cur_altsetting->desc.bInterfaceNumber;
ret = usb_set_interface(usbdev, interface_number,
- properties->altsetting);
+ properties->altsetting);
if (ret < 0) {
dev_err(&interface->dev, "set_interface failed\n");
goto error;
@@ -555,7 +553,7 @@ int line6_probe(struct usb_interface *interface,
/* creation of additional special files should go here */
dev_info(&interface->dev, "Line 6 %s now attached\n",
- line6->properties->name);
+ properties->name);
return 0;