diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-11-23 18:16:33 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-05 19:32:08 +0100 |
| commit | e83c4405ebf02151daea8ce6da3bb74b34efcd6c (patch) | |
| tree | 4b30311a320f8ed71657551fa0f738c5a315632e /sound/isa | |
| parent | adcd35a38cdec76f40f9ed4d3a3fe07eea04e0d9 (diff) | |
| download | linux-stable-e83c4405ebf02151daea8ce6da3bb74b34efcd6c.tar.gz linux-stable-e83c4405ebf02151daea8ce6da3bb74b34efcd6c.tar.bz2 linux-stable-e83c4405ebf02151daea8ce6da3bb74b34efcd6c.zip | |
ALSA: wss: Fix invalid snd_free_pages() at error path
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>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/isa')
| -rw-r--r-- | sound/isa/wss/wss_lib.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/isa/wss/wss_lib.c b/sound/isa/wss/wss_lib.c index 32453f81b95a..3a5008837576 100644 --- 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 snd_pcm_substream *substream) 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 snd_pcm_substream *substream) 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; |