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

Commit 9a20332a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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

sound/sparc/cs4231.c

+2 −6
Original line number Diff line number Diff line
@@ -1146,10 +1146,8 @@ static int snd_cs4231_playback_open(struct snd_pcm_substream *substream) 
	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(struct snd_pcm_substream *substream) 
	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);