diff options
author | Takashi Iwai <tiwai@suse.de> | 2016-03-15 12:14:49 +0100 |
---|---|---|
committer | Sasha Levin <sasha.levin@oracle.com> | 2016-07-10 23:06:54 -0400 |
commit | 00ef5df8687ff1a51660a5d27c202417a69b5018 (patch) | |
tree | 54a5811d72306b0de453e7bb6d2b451e6c7c374e /sound | |
parent | b5ba0d06632445b3810b50093cd22a2ab06900de (diff) |
ALSA: usb-audio: Minor code cleanup in create_fixed_stream_quirk()
[ Upstream commit 902eb7fd1e4af3ac69b9b30f8373f118c92b9729 ]
Just a minor code cleanup: unify the error paths.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/usb/quirks.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 194fa7f60a38..dcd4b232544a 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -164,23 +164,18 @@ static int create_fixed_stream_quirk(struct snd_usb_audio *chip, stream = (fp->endpoint & USB_DIR_IN) ? SNDRV_PCM_STREAM_CAPTURE : SNDRV_PCM_STREAM_PLAYBACK; err = snd_usb_add_audio_stream(chip, stream, fp); - if (err < 0) { - kfree(fp); - kfree(rate_table); - return err; - } + if (err < 0) + goto error; if (fp->iface != get_iface_desc(&iface->altsetting[0])->bInterfaceNumber || fp->altset_idx >= iface->num_altsetting) { - kfree(fp); - kfree(rate_table); - return -EINVAL; + err = -EINVAL; + goto error; } alts = &iface->altsetting[fp->altset_idx]; altsd = get_iface_desc(alts); if (altsd->bNumEndpoints < 1) { - kfree(fp); - kfree(rate_table); - return -EINVAL; + err = -EINVAL; + goto error; } fp->protocol = altsd->bInterfaceProtocol; @@ -193,6 +188,11 @@ static int create_fixed_stream_quirk(struct snd_usb_audio *chip, snd_usb_init_pitch(chip, fp->iface, alts, fp); snd_usb_init_sample_rate(chip, fp->iface, alts, fp, fp->rate_max); return 0; + + error: + kfree(fp); + kfree(rate_table); + return err; } static int create_auto_pcm_quirk(struct snd_usb_audio *chip, |