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 228/305] ALSA: wss: 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 7b69154171b407844c273ab4c10b5f0ddcd6aa29 upstream.

    Some spurious calls of snd_free_pages() have been overlooked and
    remain in the error paths of wss 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/isa/wss/wss_lib.c | 2 --
    1 file changed, 2 deletions(-)

    --- a/sound/isa/wss/wss_lib.c
    +++ b/sound/isa/wss/wss_lib.c
    @@ -1531,7 +1531,6 @@ static int snd_wss_playback_open(struct
    if (err < 0) {
    if (chip->release_dma)
    chip->release_dma(chip, chip->dma_private_data, chip->dma1);
    - snd_free_pages(runtime->dma_area, runtime->dma_bytes);
    return err;
    }
    chip->playback_substream = substream;
    @@ -1572,7 +1571,6 @@ static int snd_wss_capture_open(struct s
    if (err < 0) {
    if (chip->release_dma)
    chip->release_dma(chip, chip->dma_private_data, chip->dma2);
    - snd_free_pages(runtime->dma_area, runtime->dma_bytes);
    return err;
    }
    chip->capture_substream = substream;
    \
     
     \ /
      Last update: 2019-02-03 15:25    [W:4.064 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site