ALSA: usb: midi: don't return -ENOMEM when usb_urb_ep_type_check fails

Commit Message

Colin King April 20, 2021, 1:47 p.m. UTC

From: Colin Ian King <[e-mail]>

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 <[e-mail]>
---
 sound/usb/midi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Takashi Iwai April 20, 2021, 2:59 p.m. UTC | #1

On Tue, 20 Apr 2021 15:47:19 +0200,
Colin King wrote:
> 
> From: Colin Ian King <[e-mail]>
> 
> 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 <[e-mail]>

Thanks, applied.


Takashi

Patch

diff --git a/sound/usb/midi.c b/sound/usb/midi.c
index 9efda4b06acb..a10ac75969a8 100644
--- a/sound/usb/midi.c
+++ b/sound/usb/midi.c
@@ -1316,7 +1316,7 @@  static int snd_usbmidi_in_endpoint_create(struct snd_usb_midi *umidi,
 
  error:
 	snd_usbmidi_in_endpoint_delete(ep);
-	return -ENOMEM;
+	return err;
 }
 
 /*