diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-03-15 12:14:49 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-05-01 00:05:21 +0200 |
| commit | c26badfc853730dcf20820fd1d4f66fd0a2e6c92 (patch) | |
| tree | 1c56e33b90d7144a935e7ab66cf5e48f3f3659c8 /sound | |
| parent | 12ecd2fa1d46fd8025a51d3a02d23766a9241117 (diff) | |
ALSA: usb-audio: Minor code cleanup in create_fixed_stream_quirk()
commit 902eb7fd1e4af3ac69b9b30f8373f118c92b9729 upstream.
Just a minor code cleanup: unify the error paths.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
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 c5e912e74139..d3d62c7c5ce5 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -153,22 +153,17 @@ 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]; if (get_iface_desc(alts)->bNumEndpoints < 1) { - kfree(fp); - kfree(rate_table); - return -EINVAL; + err = -EINVAL; + goto error; } fp->datainterval = snd_usb_parse_datainterval(chip, alts); @@ -177,6 +172,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; } /* |