| From fe5523c423989249a348e9321db0a13fdae97310 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 20 Apr 2021 14:47:19 +0100 |
| Subject: ALSA: usb: midi: don't return -ENOMEM when usb_urb_ep_type_check |
| fails |
| |
| From: Colin Ian King <colin.king@canonical.com> |
| |
| [ 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 | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/sound/usb/midi.c b/sound/usb/midi.c |
| index 0c23fa6d8525..cd46ca7cd28d 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; |
| } |
| |
| /* |
| -- |
| 2.30.2 |
| |
