diff options
| author | Colin Ian King <colin.king@canonical.com> | 2021-04-20 14:47:19 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-14 09:44:30 +0200 |
| commit | 8d77c9564309808b523f7afafd192f92b1fb9a48 (patch) | |
| tree | 61c30a790c456b39ec94f79da3b4e08629383afc /sound | |
| parent | 59f965ef61d7f10dcadc8a927e2c1f4881193664 (diff) | |
| download | linux-stable-8d77c9564309808b523f7afafd192f92b1fb9a48.tar.gz linux-stable-8d77c9564309808b523f7afafd192f92b1fb9a48.tar.bz2 linux-stable-8d77c9564309808b523f7afafd192f92b1fb9a48.zip | |
ALSA: usb: midi: don't return -ENOMEM when usb_urb_ep_type_check fails
[ 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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/usb/midi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/midi.c b/sound/usb/midi.c index 1cc17c449407..c205a26ef509 100644 --- a/sound/usb/midi.c +++ b/sound/usb/midi.c @@ -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; } /* |