]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
ALSA: usb: midi: don't return -ENOMEM when usb_urb_ep_type_check fails
authorColin Ian King <colin.king@canonical.com>
Tue, 20 Apr 2021 13:47:19 +0000 (14:47 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 14 May 2021 07:44:30 +0000 (09:44 +0200)
[ Upstream commit cfd577acb769301b19c31361d45ae1f145318b7a ]

Currently when the call to usb_urb_ep_type_check fails (returning -EINVAL)
the error return path returns -ENOMEM via the exit label "error". Other
uses of the same error exit label set the err variable to -ENOMEM but this
is not being used.  I believe the original intent was for the error exit
path to return the value in err rather than the hard coded -ENOMEM, so
return this rather than the hard coded -ENOMEM.

Addresses-Coverity: ("Unused value")
Fixes: 738d9edcfd44 ("ALSA: usb-audio: Add sanity checks for invalid EPs")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Link: https://lore.kernel.org/r/20210420134719.381409-1-colin.king@canonical.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/usb/midi.c

index 1cc17c449407c5091c90cea9f0862c2d3973752e..c205a26ef509211dd2a4cd34c5d359256e2a76bf 100644 (file)
@@ -1332,7 +1332,7 @@ static int snd_usbmidi_in_endpoint_create(struct snd_usb_midi *umidi,
 
  error:
        snd_usbmidi_in_endpoint_delete(ep);
-       return -ENOMEM;
+       return err;
 }
 
 /*