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

Commit 81ac55aa authored by Troy Kisky's avatar Troy Kisky Committed by Mark Brown
Browse files

ASoC: DaVinci: Fix divide by zero error during 1st execution 



When both playback and capture stream were open
davinci_i2s_hw_params was setting parameters for
the wrong stream. The fix for davinci_i2s_hw_params
is sufficient, but it looks like a race still happens
in davici_pcm_open. This patch also makes the race smaller
but the next patch provides a better fix.

Signed-off-by: default avatarTroy Kisky <troy.kisky@boundarydevices.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent df0fd5e5

sound/soc/davinci/davinci-i2s.c

+2 −1
Original line number Diff line number Diff line
@@ -353,8 +353,9 @@ static int davinci_i2s_hw_params(struct snd_pcm_substream *substream, 
				 struct snd_pcm_hw_params *params,

				 struct snd_soc_dai *dai)

{

	struct davinci_pcm_dma_params *dma_params = dai->dma_data;

	struct davinci_mcbsp_dev *dev = dai->private_data;

	struct davinci_pcm_dma_params *dma_params =

					dev->dma_params[substream->stream];

	struct snd_interval *i = NULL;

	int mcbsp_word_length;

	unsigned int rcr, xcr, srgr;

sound/soc/davinci/davinci-pcm.c

+5 −7
Original line number Diff line number Diff line
@@ -126,16 +126,9 @@ static void davinci_pcm_dma_irq(unsigned lch, u16 ch_status, void *data) 
static int davinci_pcm_dma_request(struct snd_pcm_substream *substream)

{

	struct davinci_runtime_data *prtd = substream->runtime->private_data;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct davinci_pcm_dma_params *dma_data = rtd->dai->cpu_dai->dma_data;

	struct edmacc_param p_ram;

	int ret;



	if (!dma_data)

		return -ENODEV;



	prtd->params = dma_data;



	/* Request master DMA channel */

	ret = edma_alloc_channel(prtd->params->channel,

				  davinci_pcm_dma_irq, substream,
@@ -244,6 +237,10 @@ static int davinci_pcm_open(struct snd_pcm_substream *substream) 
	struct snd_pcm_runtime *runtime = substream->runtime;

	struct davinci_runtime_data *prtd;

	int ret = 0;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct davinci_pcm_dma_params *params = rtd->dai->cpu_dai->dma_data;

	if (!params)

		return -ENODEV;



	snd_soc_set_runtime_hwparams(substream, &davinci_pcm_hardware);

	/* ensure that buffer size is a multiple of period size */
@@ -257,6 +254,7 @@ static int davinci_pcm_open(struct snd_pcm_substream *substream) 
		return -ENOMEM;



	spin_lock_init(&prtd->lock);

	prtd->params = params;



	runtime->private_data = prtd;