aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolin Chen <Guangyu.Chen@freescale.com>2014-04-11 10:10:00 -0400
committerMark Brown <broonie@linaro.org>2014-04-14 16:29:55 -0400
commitf84526cfae46672308a361333c76b724384b61ee (patch)
treec74f7322128fef12d06b9f428bde76592874fc47
parentca3e35c7a37cb59b12a1839d03c621cf8fa9a3d9 (diff)
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>
-rw-r--r--sound/soc/fsl/fsl_sai.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index 1c93282fbd26..a25e8884b09d 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -409,7 +409,8 @@ static int fsl_sai_trigger(struct snd_pcm_substream *substream, int cmd,
409 regmap_update_bits(sai->regmap, FSL_SAI_xCSR(tx), 409 regmap_update_bits(sai->regmap, FSL_SAI_xCSR(tx),
410 FSL_SAI_CSR_xIE_MASK, 0); 410 FSL_SAI_CSR_xIE_MASK, 0);
411 411
412 if (!(tcsr & FSL_SAI_CSR_FRDE || rcsr & FSL_SAI_CSR_FRDE)) { 412 /* Check if the opposite FRDE is also disabled */
413 if (!(tx ? rcsr & FSL_SAI_CSR_FRDE : tcsr & FSL_SAI_CSR_FRDE)) {
413 regmap_update_bits(sai->regmap, FSL_SAI_TCSR, 414 regmap_update_bits(sai->regmap, FSL_SAI_TCSR,
414 FSL_SAI_CSR_TERE, 0); 415 FSL_SAI_CSR_TERE, 0);
415 regmap_update_bits(sai->regmap, FSL_SAI_RCSR, 416 regmap_update_bits(sai->regmap, FSL_SAI_RCSR,