summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/lm49453.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/sound/soc/codecs/lm49453.c b/sound/soc/codecs/lm49453.c
index 89bbe037f81f..5eb726b3ff1b 100644
--- a/sound/soc/codecs/lm49453.c
+++ b/sound/soc/codecs/lm49453.c
@@ -1177,27 +1177,24 @@ static int lm49453_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
{
struct snd_soc_codec *codec = codec_dai->codec;
- int aif_val = 0;
+ u16 aif_val;
int mode = 0;
int clk_phase = 0;
int clk_shift = 0;
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
case SND_SOC_DAIFMT_CBS_CFS:
- aif_val = ~LM49453_AUDIO_PORT1_BASIC_CLK_MS |
- ~LM49453_AUDIO_PORT1_BASIC_SYNC_MS;
+ aif_val = 0;
break;
case SND_SOC_DAIFMT_CBS_CFM:
- aif_val = ~LM49453_AUDIO_PORT1_BASIC_CLK_MS |
- LM49453_AUDIO_PORT1_BASIC_SYNC_MS;
+ aif_val = LM49453_AUDIO_PORT1_BASIC_SYNC_MS;
break;
case SND_SOC_DAIFMT_CBM_CFS:
- aif_val = LM49453_AUDIO_PORT1_BASIC_CLK_MS |
- ~LM49453_AUDIO_PORT1_BASIC_SYNC_MS;
+ aif_val = LM49453_AUDIO_PORT1_BASIC_CLK_MS;
break;
case SND_SOC_DAIFMT_CBM_CFM:
aif_val = LM49453_AUDIO_PORT1_BASIC_CLK_MS |
- LM49453_AUDIO_PORT1_BASIC_SYNC_MS;
+ LM49453_AUDIO_PORT1_BASIC_SYNC_MS;
break;
default:
return -EINVAL;