lkml.org 
[lkml]   [2019]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 229/305] ALSA: sparc: Fix invalid snd_free_pages() at error path
    3.16.63-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Takashi Iwai <tiwai@suse.de>

    commit 9a20332ab373b1f8f947e0a9c923652b32dab031 upstream.

    Some spurious calls of snd_free_pages() have been overlooked and
    remain in the error paths of sparc cs4231 driver code. Since
    runtime->dma_area is managed by the PCM core helper, we shouldn't
    release manually.

    Drop the superfluous calls.

    Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    sound/sparc/cs4231.c | 8 ++------
    1 file changed, 2 insertions(+), 6 deletions(-)

    --- a/sound/sparc/cs4231.c
    +++ b/sound/sparc/cs4231.c
    @@ -1146,10 +1146,8 @@ static int snd_cs4231_playback_open(stru
    runtime->hw = snd_cs4231_playback;

    err = snd_cs4231_open(chip, CS4231_MODE_PLAY);
    - if (err < 0) {
    - snd_free_pages(runtime->dma_area, runtime->dma_bytes);
    + if (err < 0)
    return err;
    - }
    chip->playback_substream = substream;
    chip->p_periods_sent = 0;
    snd_pcm_set_sync(substream);
    @@ -1167,10 +1165,8 @@ static int snd_cs4231_capture_open(struc
    runtime->hw = snd_cs4231_capture;

    err = snd_cs4231_open(chip, CS4231_MODE_RECORD);
    - if (err < 0) {
    - snd_free_pages(runtime->dma_area, runtime->dma_bytes);
    + if (err < 0)
    return err;
    - }
    chip->capture_substream = substream;
    chip->c_periods_sent = 0;
    snd_pcm_set_sync(substream);
    \
     
     \ /
      Last update: 2019-02-03 15:31    [W:8.896 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site