Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b691541 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: wss: Fix invalid snd_free_pages() at error path 



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: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 8cd65271

sound/isa/wss/wss_lib.c

+0 −2
Original line number Diff line number Diff line
@@ -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;