diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2019-08-26 16:45:50 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-12 19:20:50 +0100 |
| commit | e0051889243d34bcf834396be3a255b529b29f1e (patch) | |
| tree | 6854375079a93a0b89e3ef43ca932e0104e01495 /sound | |
| parent | 4f6c5200269998f0066e1bd4db931297b7b2b906 (diff) | |
| download | linux-stable-e0051889243d34bcf834396be3a255b529b29f1e.tar.gz linux-stable-e0051889243d34bcf834396be3a255b529b29f1e.tar.bz2 linux-stable-e0051889243d34bcf834396be3a255b529b29f1e.zip | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/usb/mixer.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index e3983edf210e..bb67131e6437 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -2670,7 +2670,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; |