Skip to contentSkip to conversation

ALSA: usb-audio: remove some dead code

PATCH Applied Dan Carpenter 2 participants 2 messages Aug 26, 2019

Subsystems (2)
Sound Kernel janitors
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 ALSA: usb-audio: remove some dead code

We recently cleaned up the error handling in commit 52c3e317a857 ("ALSA:
usb-audio: Unify the release of usb_mixer_elem_info objects") but accidentally left this stray return.

Signed-off-by Dan Carpenter <[email protected]>
---
 sound/usb/mixer.c | 1 -
 1 file changed, 1 deletion(-)
sound/usb/mixer.c +0 -1
index a0468c4a6326..a607577f0097 100644
@@ -2633,7 +2633,6 @@ static int parse_audio_selector_unit(struct mixer_build *state, int unitid,
 		usb_audio_err(state->chip, "cannot malloc kcontrol\n");
 		err = -ENOMEM;
 		goto error_name;
-		return -ENOMEM;
 	}
 	kctl->private_value = (unsigned long)namelist;
 	kctl->private_free = usb_mixer_selector_elem_free;
Signature · 1 line
2.20.1
Applied
#1 lore raw
Quoted 6 lines · Dan Carpenter

We recently cleaned up the error handling in commit 52c3e317a857 ("ALSA:
usb-audio: Unify the release of usb_mixer_elem_info objects") but accidentally left this stray return.

Signed-off-by Dan Carpenter <[email protected]>

Thanks, applied now.

Takashi