summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-11-29 22:28:40 +0100
committerBen Hutchings <ben@decadent.org.uk>2017-03-16 02:26:26 +0000
commit37fc9bf0854c387b5f73229a11068020c4c9f85a (patch)
tree5ddfdb95d9da993d9a95f7d3891d2fb412e5abd9 /sound
parent3fbf28600c09d60f44378dcc2f1395f37f93bc96 (diff)
downloadlinux-stable-37fc9bf0854c387b5f73229a11068020c4c9f85a.tar.gz
linux-stable-37fc9bf0854c387b5f73229a11068020c4c9f85a.tar.bz2
linux-stable-37fc9bf0854c387b5f73229a11068020c4c9f85a.zip
ALSA: usb-audio: Fix bogus error return in snd_usb_create_stream()
commit 4763601a56f155ddf94ef35fc2c41504a2de15f5 upstream. The function returns -EINVAL even if it builds the stream properly. The bogus error code sneaked in during the code refactoring, but it wasn't noticed until now since the returned error code itself is ignored in anyway. Kill it here, but there is no behavior change by this patch, obviously. Fixes: e5779998bf8b ('ALSA: usb-audio: refactor code') Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'sound')
-rw-r--r--sound/usb/card.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/usb/card.c b/sound/usb/card.c
index 34f934095ddd..8887f4e19956 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -204,7 +204,6 @@ static int snd_usb_create_stream(struct snd_usb_audio *chip, int ctrlif, int int
if (! snd_usb_parse_audio_interface(chip, interface)) {
usb_set_interface(dev, interface, 0); /* reset the current interface */
usb_driver_claim_interface(&usb_audio_driver, iface, (void *)-1L);
- return -EINVAL;
}
return 0;