Commit f84526cf authored Apr 11, 2014 by Nicolin Chen Committed by Mark Brown Apr 14, 2014

ASoC: fsl_sai: Fix incorrect condition check in trigger()



Patch ASoC: fsl_sai: Fix buggy configurations in trigger() doesn't entirely
fix the condition: FRDE of the current substream direction is being cleared
while the code is still using the non-updated one.

Thus this patch fixes this issue by checking the opposite one's FRDE alone
since the current one's is absolutely disabled.

Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

parent ca3e35c7

sound/soc/fsl/fsl_sai.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -409,7 +409,8 @@ static int fsl_sai_trigger(struct snd_pcm_substream *substream, int cmd,
		regmap_update_bits(sai->regmap, FSL_SAI_xCSR(tx),
		FSL_SAI_CSR_xIE_MASK, 0);

		if (!(tcsr & FSL_SAI_CSR_FRDE \|\| rcsr & FSL_SAI_CSR_FRDE)) {
		/* Check if the opposite FRDE is also disabled */
		if (!(tx ? rcsr & FSL_SAI_CSR_FRDE : tcsr & FSL_SAI_CSR_FRDE)) {
		regmap_update_bits(sai->regmap, FSL_SAI_TCSR,
		FSL_SAI_CSR_TERE, 0);
		regmap_update_bits(sai->regmap, FSL_SAI_RCSR,

Admin message