lkml.org 
[lkml]   [2016]   [Apr]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 062/115] ALSA: usb-audio: Minor code cleanup in create_fixed_stream_quirk()
    3.2.80-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Takashi Iwai <tiwai@suse.de>

    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>
    ---
    sound/usb/quirks.c | 22 +++++++++++-----------
    1 file changed, 11 insertions(+), 11 deletions(-)

    --- a/sound/usb/quirks.c
    +++ b/sound/usb/quirks.c
    @@ -153,22 +153,17 @@ static int create_fixed_stream_quirk(str
    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(str
    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;
    }

    /*
    \
     
     \ /
      Last update: 2016-04-27 02:01    [W:4.106 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site