summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-11-29 22:28:40 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-12 11:22:47 +0100
commitf5531856c2c7763f8880fc4319830cc59cf1c8c3 (patch)
tree262a9448ddc2da9353c2b0511c82b39f9fb58076 /sound
parentd576c36a3e1f92d1f81f214890510881fb03194c (diff)
downloadlinux-stable-f5531856c2c7763f8880fc4319830cc59cf1c8c3.tar.gz
linux-stable-f5531856c2c7763f8880fc4319830cc59cf1c8c3.tar.bz2
linux-stable-f5531856c2c7763f8880fc4319830cc59cf1c8c3.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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 1f09d9591276..a1cbaa5f7fc9 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -202,7 +202,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;