diff options
author | Nicolin Chen <Guangyu.Chen@freescale.com> | 2014-04-11 10:10:00 -0400 |
---|---|---|
committer | Nitin Garg <nitin.garg@freescale.com> | 2014-04-16 09:58:20 -0400 |
commit | ed72dbf3f697afebb8dcacde353af3ee2b60746a (patch) | |
tree | d8e721e0483e5d922be04f265855c6b9850299cf /sound/soc/fsl | |
parent | 9ad243853cfe238558fae6614e2a84d5b861a301 (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>
(cherry picked from commit f84526cfae46672308a361333c76b724384b61ee)
Diffstat (limited to 'sound/soc/fsl')
-rw-r--r-- | sound/soc/fsl/fsl_sai.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index ffdd1417ed46..28c644675f0e 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, |