Skip to contentSkip to conversation

ASoC: ssm2518: Fix trivial typo in checking tx_mask and rx_mask values

PATCH Applied Axel Lin 3 participants 3 messages Jun 10, 2013

Subsystems (3)
Sound ASoC Analog devices inc ASoC codec drivers
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 ASoC: ssm2518: Fix trivial typo in checking tx_mask and rx_mask values

Otherwise, ssm2518_set_tdm_slot() always returns error if slots != 0.

Signed-off-by Axel Lin <[email protected]>
---
 sound/soc/codecs/ssm2518.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/ssm2518.c +1 -1
index a76b341..f4883d9 100644
@@ -538,7 +538,7 @@ static int ssm2518_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
 			SSM2518_REG_SAI_CTRL1, SSM2518_SAI_CTRL1_SAI_MASK,
 			SSM2518_SAI_CTRL1_SAI_I2S);
 
-	if (tx_mask == 0 || tx_mask != 0)
+	if (tx_mask == 0 || rx_mask != 0)
 		return -EINVAL;
 
 	if (slots == 1) {
Signature · 1 line
1.8.1.2
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 3 lines · Axel Lin

Otherwise, ssm2518_set_tdm_slot() always returns error if slots != 0.

Signed-off-by Axel Lin <[email protected]>
Acked-by Lars-Peter Clausen <[email protected]>

Thanks.

Quoted 17 lines
---
 sound/soc/codecs/ssm2518.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/ssm2518.c +1 -1
index a76b341..f4883d9 100644
@@ -538,7 +538,7 @@ static int ssm2518_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
 			SSM2518_REG_SAI_CTRL1, SSM2518_SAI_CTRL1_SAI_MASK,
 			SSM2518_SAI_CTRL1_SAI_I2S);
 
-	if (tx_mask == 0 || tx_mask != 0)
+	if (tx_mask == 0 || rx_mask != 0)
 		return -EINVAL;
 
 	if (slots == 1) {
maintainer Applied
#2 lore raw
In reply to Axel Lin
Quoted 1 line · Axel Lin

Otherwise, ssm2518_set_tdm_slot() always returns error if slots != 0.

Applied, thanks.