| From fa5f16d24016195091d145fd1f195a3c3f18331d Mon Sep 17 00:00:00 2001 |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| Date: Mon, 26 Aug 2019 16:45:50 +0300 |
| Subject: [PATCH] ALSA: usb-audio: remove some dead code |
| |
| commit b39e077fcb283dd96dd251a3abeba585402c61fe upstream. |
| |
| 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. |
| |
| Fixes: 52c3e317a857 ("ALSA: usb-audio: Unify the release of usb_mixer_elem_info objects") |
| Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c |
| index 5291739cab57..673652ad7018 100644 |
| --- a/sound/usb/mixer.c |
| +++ b/sound/usb/mixer.c |
| @@ -2651,7 +2651,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; |
| -- |
| 2.7.4 |
| |
