diff options
-rw-r--r-- | sound/soc/s6000/s6000-i2s.c | 4 | ||||
-rw-r--r-- | sound/soc/s6000/s6105-ipcam.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/s6000/s6000-i2s.c b/sound/soc/s6000/s6000-i2s.c index dcc79040bdac..c5cda187ecab 100644 --- a/sound/soc/s6000/s6000-i2s.c +++ b/sound/soc/s6000/s6000-i2s.c | |||
@@ -252,10 +252,10 @@ static int s6000_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai, | |||
252 | } | 252 | } |
253 | 253 | ||
254 | switch (fmt & SND_SOC_DAIFMT_INV_MASK) { | 254 | switch (fmt & SND_SOC_DAIFMT_INV_MASK) { |
255 | case SND_SOC_DAIFMT_IB_IF: | 255 | case SND_SOC_DAIFMT_NB_NF: |
256 | w |= S6_I2S_LEFT_FIRST; | 256 | w |= S6_I2S_LEFT_FIRST; |
257 | break; | 257 | break; |
258 | case SND_SOC_DAIFMT_IB_NF: | 258 | case SND_SOC_DAIFMT_NB_IF: |
259 | w |= S6_I2S_RIGHT_FIRST; | 259 | w |= S6_I2S_RIGHT_FIRST; |
260 | break; | 260 | break; |
261 | default: | 261 | default: |
diff --git a/sound/soc/s6000/s6105-ipcam.c b/sound/soc/s6000/s6105-ipcam.c index 21c4f55106ca..b5f95f9781c1 100644 --- a/sound/soc/s6000/s6105-ipcam.c +++ b/sound/soc/s6000/s6105-ipcam.c | |||
@@ -43,7 +43,7 @@ static int s6105_hw_params(struct snd_pcm_substream *substream, | |||
43 | 43 | ||
44 | /* set cpu DAI configuration */ | 44 | /* set cpu DAI configuration */ |
45 | ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_CBM_CFM | | 45 | ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_CBM_CFM | |
46 | SND_SOC_DAIFMT_IB_IF); | 46 | SND_SOC_DAIFMT_NB_NF); |
47 | if (ret < 0) | 47 | if (ret < 0) |
48 | return ret; | 48 | return ret; |
49 | 49 | ||