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

Commit 7b3d165a authored by Jyri Sarha's avatar Jyri Sarha Committed by Mark Brown
Browse files

ASoC: davinci-mcasp: Index ruledata in drvdata with substream->stream 



The serializer direction definitions runs from 1 to 2, which does not
suite the purpose. The substream->stream is perfect for the purpose
and should have been used from the beginning.

Signed-off-by: default avatarJyri Sarha <jsarha@ti.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a75a053f

sound/soc/davinci/davinci-mcasp.c

+2 −2
Original line number Diff line number Diff line
@@ -1149,7 +1149,7 @@ static int davinci_mcasp_startup(struct snd_pcm_substream *substream, 
		if (mcasp->serial_dir[i] == dir)

			max_channels++;

	}

	mcasp->ruledata[dir].serializers = max_channels;

	mcasp->ruledata[substream->stream].serializers = max_channels;

	max_channels *= mcasp->tdm_slots;

	/*

	 * If the already active stream has less channels than the calculated
@@ -1172,7 +1172,7 @@ static int davinci_mcasp_startup(struct snd_pcm_substream *substream, 
	if (mcasp->bclk_master && mcasp->bclk_div == 0 && mcasp->sysclk_freq) {

		int ret;



		mcasp->ruledata[dir].mcasp = mcasp;

		mcasp->ruledata[substream->stream].mcasp = mcasp;



		ret = snd_pcm_hw_rule_add(substream->runtime, 0,

					  SNDRV_PCM_HW_PARAM_RATE,