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

Commit 25e9e756 authored by Joachim Eastwood's avatar Joachim Eastwood Committed by Mark Brown
Browse files

ASoC: check for substream not channels_min in pcm engines 



This is a follow up on 53dea36c which fixes the other affected
pcm engines.

Description from 53dea36c:
 Don't rely on the codec's channels_min information to decide wheter or
 not allocate a substream's DMA buffer. Rather check if the substream
 itself was allocated previously.

Without this patch I was seeing null-pointer dereferenc in atmel-pcm.

Signed-off-by: default avatarJoachim Eastwood <joachim.eastwood@jotron.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 739be96a

sound/soc/atmel/atmel-pcm.c

+2 −3
Original line number Diff line number Diff line
@@ -367,7 +367,6 @@ static u64 atmel_pcm_dmamask = 0xffffffff; 
static int atmel_pcm_new(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_card *card = rtd->card->snd_card;

	struct snd_soc_dai *dai = rtd->cpu_dai;

	struct snd_pcm *pcm = rtd->pcm;

	int ret = 0;
@@ -376,14 +375,14 @@ static int atmel_pcm_new(struct snd_soc_pcm_runtime *rtd) 
	if (!card->dev->coherent_dma_mask)

		card->dev->coherent_dma_mask = 0xffffffff;



	if (dai->driver->playback.channels_min) {

	if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {

		ret = atmel_pcm_preallocate_dma_buffer(pcm,

			SNDRV_PCM_STREAM_PLAYBACK);

		if (ret)

			goto out;

	}



	if (dai->driver->capture.channels_min) {

	if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {

		pr_debug("atmel-pcm:"

				"Allocating PCM capture DMA buffer\n");

		ret = atmel_pcm_preallocate_dma_buffer(pcm,

sound/soc/blackfin/bf5xx-ac97-pcm.c

+2 −3
Original line number Diff line number Diff line
@@ -421,7 +421,6 @@ static u64 bf5xx_pcm_dmamask = DMA_BIT_MASK(32); 
static int bf5xx_pcm_ac97_new(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_card *card = rtd->card->snd_card;

	struct snd_soc_dai *dai = rtd->cpu_dai;

	struct snd_pcm *pcm = rtd->pcm;

	int ret = 0;
@@ -431,14 +430,14 @@ static int bf5xx_pcm_ac97_new(struct snd_soc_pcm_runtime *rtd) 
	if (!card->dev->coherent_dma_mask)

		card->dev->coherent_dma_mask = DMA_BIT_MASK(32);



	if (dai->driver->playback.channels_min) {

	if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {

		ret = bf5xx_pcm_preallocate_dma_buffer(pcm,

			SNDRV_PCM_STREAM_PLAYBACK);

		if (ret)

			goto out;

	}



	if (dai->driver->capture.channels_min) {

	if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {

		ret = bf5xx_pcm_preallocate_dma_buffer(pcm,

			SNDRV_PCM_STREAM_CAPTURE);

		if (ret)

sound/soc/blackfin/bf5xx-i2s-pcm.c

+2 −3
Original line number Diff line number Diff line
@@ -260,7 +260,6 @@ static u64 bf5xx_pcm_dmamask = DMA_BIT_MASK(32); 
static int bf5xx_pcm_i2s_new(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_card *card = rtd->card->snd_card;

	struct snd_soc_dai *dai = rtd->cpu_dai;

	struct snd_pcm *pcm = rtd->pcm;

	int ret = 0;
@@ -270,14 +269,14 @@ static int bf5xx_pcm_i2s_new(struct snd_soc_pcm_runtime *rtd) 
	if (!card->dev->coherent_dma_mask)

		card->dev->coherent_dma_mask = DMA_BIT_MASK(32);



	if (dai->driver->playback.channels_min) {

	if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {

		ret = bf5xx_pcm_preallocate_dma_buffer(pcm,

			SNDRV_PCM_STREAM_PLAYBACK);

		if (ret)

			goto out;

	}



	if (dai->driver->capture.channels_min) {

	if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {

		ret = bf5xx_pcm_preallocate_dma_buffer(pcm,

			SNDRV_PCM_STREAM_CAPTURE);

		if (ret)

sound/soc/blackfin/bf5xx-tdm-pcm.c

+2 −3
Original line number Diff line number Diff line
@@ -286,7 +286,6 @@ static u64 bf5xx_pcm_dmamask = DMA_BIT_MASK(32); 
static int bf5xx_pcm_tdm_new(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_card *card = rtd->card->snd_card;

	struct snd_soc_dai *dai = rtd->cpu_dai;

	struct snd_pcm *pcm = rtd->pcm;

	int ret = 0;
@@ -295,14 +294,14 @@ static int bf5xx_pcm_tdm_new(struct snd_soc_pcm_runtime *rtd) 
	if (!card->dev->coherent_dma_mask)

		card->dev->coherent_dma_mask = DMA_BIT_MASK(32);



	if (dai->driver->playback.channels_min) {

	if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {

		ret = bf5xx_pcm_preallocate_dma_buffer(pcm,

			SNDRV_PCM_STREAM_PLAYBACK);

		if (ret)

			goto out;

	}



	if (dai->driver->capture.channels_min) {

	if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {

		ret = bf5xx_pcm_preallocate_dma_buffer(pcm,

			SNDRV_PCM_STREAM_CAPTURE);

		if (ret)

sound/soc/davinci/davinci-pcm.c

+2 −3
Original line number Diff line number Diff line
@@ -831,7 +831,6 @@ static u64 davinci_pcm_dmamask = 0xffffffff; 
static int davinci_pcm_new(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_card *card = rtd->card->snd_card;

	struct snd_soc_dai *dai = rtd->cpu_dai;

	struct snd_pcm *pcm = rtd->pcm;

	int ret;
@@ -840,7 +839,7 @@ static int davinci_pcm_new(struct snd_soc_pcm_runtime *rtd) 
	if (!card->dev->coherent_dma_mask)

		card->dev->coherent_dma_mask = 0xffffffff;



	if (dai->driver->playback.channels_min) {

	if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {

		ret = davinci_pcm_preallocate_dma_buffer(pcm,

			SNDRV_PCM_STREAM_PLAYBACK,

			pcm_hardware_playback.buffer_bytes_max);
@@ -848,7 +847,7 @@ static int davinci_pcm_new(struct snd_soc_pcm_runtime *rtd) 
			return ret;

	}



	if (dai->driver->capture.channels_min) {

	if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {

		ret = davinci_pcm_preallocate_dma_buffer(pcm,

			SNDRV_PCM_STREAM_CAPTURE,

			pcm_hardware_capture.buffer_bytes_max);