* [PATCH] ASoC: fsl_sai: Fix incorrect condition check in trigger()
@ 2014-04-11 14:10 ` Nicolin Chen
0 siblings, 0 replies; 8+ messages in thread
From: Nicolin Chen @ 2014-04-11 14:10 UTC (permalink / raw)
To: broonie; +Cc: linux-kernel, linuxppc-dev, alsa-devel, timur, Li.Xiubo
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>
---
sound/soc/fsl/fsl_sai.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index 9858d42..1716a41 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -343,7 +343,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,
--
1.8.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH] ASoC: fsl_sai: Fix incorrect condition check in trigger()
@ 2014-04-11 14:10 ` Nicolin Chen
0 siblings, 0 replies; 8+ messages in thread
From: Nicolin Chen @ 2014-04-11 14:10 UTC (permalink / raw)
To: broonie; +Cc: linux-kernel, linuxppc-dev, alsa-devel, timur, Li.Xiubo
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>
---
sound/soc/fsl/fsl_sai.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index 9858d42..1716a41 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -343,7 +343,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,
--
1.8.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH] ASoC: fsl_sai: Fix incorrect condition check in trigger()
@ 2014-04-11 14:10 ` Nicolin Chen
0 siblings, 0 replies; 8+ messages in thread
From: Nicolin Chen @ 2014-04-11 14:10 UTC (permalink / raw)
To: broonie; +Cc: alsa-devel, Li.Xiubo, linuxppc-dev, linux-kernel, timur
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>
---
sound/soc/fsl/fsl_sai.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index 9858d42..1716a41 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -343,7 +343,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,
--
1.8.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] ASoC: fsl_sai: Fix incorrect condition check in trigger()
2014-04-11 14:10 ` Nicolin Chen
@ 2014-04-14 20:31 ` Mark Brown
-1 siblings, 0 replies; 8+ messages in thread
From: Mark Brown @ 2014-04-14 20:31 UTC (permalink / raw)
To: Nicolin Chen; +Cc: linux-kernel, linuxppc-dev, alsa-devel, timur, Li.Xiubo
[-- Attachment #1: Type: text/plain, Size: 310 bytes --]
On Fri, Apr 11, 2014 at 10:10:00PM +0800, Nicolin Chen wrote:
> + /* Check if the opposite FRDE is also disabled */
> + if (!(tx ? rcsr & FSL_SAI_CSR_FRDE : tcsr & FSL_SAI_CSR_FRDE)) {
I've applied this since it's a fix but this is *not* a triumph of
legibility, the ternery operator is often not helpful.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] ASoC: fsl_sai: Fix incorrect condition check in trigger()
@ 2014-04-14 20:31 ` Mark Brown
0 siblings, 0 replies; 8+ messages in thread
From: Mark Brown @ 2014-04-14 20:31 UTC (permalink / raw)
To: Nicolin Chen; +Cc: alsa-devel, Li.Xiubo, linuxppc-dev, linux-kernel, timur
[-- Attachment #1: Type: text/plain, Size: 310 bytes --]
On Fri, Apr 11, 2014 at 10:10:00PM +0800, Nicolin Chen wrote:
> + /* Check if the opposite FRDE is also disabled */
> + if (!(tx ? rcsr & FSL_SAI_CSR_FRDE : tcsr & FSL_SAI_CSR_FRDE)) {
I've applied this since it's a fix but this is *not* a triumph of
legibility, the ternery operator is often not helpful.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] ASoC: fsl_sai: Fix incorrect condition check in trigger()
2014-04-14 20:31 ` Mark Brown
(?)
@ 2014-04-15 2:33 ` Nicolin Chen
-1 siblings, 0 replies; 8+ messages in thread
From: Nicolin Chen @ 2014-04-15 2:33 UTC (permalink / raw)
To: Mark Brown; +Cc: linux-kernel, linuxppc-dev, alsa-devel, timur, Li.Xiubo
On Mon, Apr 14, 2014 at 09:31:26PM +0100, Mark Brown wrote:
> On Fri, Apr 11, 2014 at 10:10:00PM +0800, Nicolin Chen wrote:
>
> > + /* Check if the opposite FRDE is also disabled */
> > + if (!(tx ? rcsr & FSL_SAI_CSR_FRDE : tcsr & FSL_SAI_CSR_FRDE)) {
>
> I've applied this since it's a fix but this is *not* a triumph of
> legibility, the ternery operator is often not helpful.
It looks like I've got a bad habit again. I'll be careful next time.
Thank you for reminding me,
Nicolin
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] ASoC: fsl_sai: Fix incorrect condition check in trigger()
@ 2014-04-15 2:33 ` Nicolin Chen
0 siblings, 0 replies; 8+ messages in thread
From: Nicolin Chen @ 2014-04-15 2:33 UTC (permalink / raw)
To: Mark Brown; +Cc: linux-kernel, linuxppc-dev, alsa-devel, timur, Li.Xiubo
On Mon, Apr 14, 2014 at 09:31:26PM +0100, Mark Brown wrote:
> On Fri, Apr 11, 2014 at 10:10:00PM +0800, Nicolin Chen wrote:
>
> > + /* Check if the opposite FRDE is also disabled */
> > + if (!(tx ? rcsr & FSL_SAI_CSR_FRDE : tcsr & FSL_SAI_CSR_FRDE)) {
>
> I've applied this since it's a fix but this is *not* a triumph of
> legibility, the ternery operator is often not helpful.
It looks like I've got a bad habit again. I'll be careful next time.
Thank you for reminding me,
Nicolin
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] ASoC: fsl_sai: Fix incorrect condition check in trigger()
@ 2014-04-15 2:33 ` Nicolin Chen
0 siblings, 0 replies; 8+ messages in thread
From: Nicolin Chen @ 2014-04-15 2:33 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, Li.Xiubo, linuxppc-dev, linux-kernel, timur
On Mon, Apr 14, 2014 at 09:31:26PM +0100, Mark Brown wrote:
> On Fri, Apr 11, 2014 at 10:10:00PM +0800, Nicolin Chen wrote:
>
> > + /* Check if the opposite FRDE is also disabled */
> > + if (!(tx ? rcsr & FSL_SAI_CSR_FRDE : tcsr & FSL_SAI_CSR_FRDE)) {
>
> I've applied this since it's a fix but this is *not* a triumph of
> legibility, the ternery operator is often not helpful.
It looks like I've got a bad habit again. I'll be careful next time.
Thank you for reminding me,
Nicolin
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2014-04-15 2:39 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-11 14:10 [PATCH] ASoC: fsl_sai: Fix incorrect condition check in trigger() Nicolin Chen
2014-04-11 14:10 ` Nicolin Chen
2014-04-11 14:10 ` Nicolin Chen
2014-04-14 20:31 ` Mark Brown
2014-04-14 20:31 ` Mark Brown
2014-04-15 2:33 ` Nicolin Chen
2014-04-15 2:33 ` Nicolin Chen
2014-04-15 2:33 ` Nicolin Chen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.