diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-10 07:22:30 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-10 07:22:30 -0500 |
commit | 49a170bcf28af5ef372cdbed7750ba8d4162bb0e (patch) | |
tree | c516c7e5ad8f437bfd9dc0be647e1637e3c298b9 /sound | |
parent | 921c038d87bc02accc8c5904ae080d6b67567974 (diff) | |
parent | 5f960294e2031d12f10c8488c3446fecbf59628d (diff) |
Merge remote-tracking branch 'asoc/fix/wm5100' into tmp
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/codecs/wm5100.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c index 5a5f36936235..54397a508073 100644 --- a/sound/soc/codecs/wm5100.c +++ b/sound/soc/codecs/wm5100.c | |||
@@ -1279,15 +1279,9 @@ static int wm5100_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) | |||
1279 | case SND_SOC_DAIFMT_DSP_A: | 1279 | case SND_SOC_DAIFMT_DSP_A: |
1280 | mask = 0; | 1280 | mask = 0; |
1281 | break; | 1281 | break; |
1282 | case SND_SOC_DAIFMT_DSP_B: | ||
1283 | mask = 1; | ||
1284 | break; | ||
1285 | case SND_SOC_DAIFMT_I2S: | 1282 | case SND_SOC_DAIFMT_I2S: |
1286 | mask = 2; | 1283 | mask = 2; |
1287 | break; | 1284 | break; |
1288 | case SND_SOC_DAIFMT_LEFT_J: | ||
1289 | mask = 3; | ||
1290 | break; | ||
1291 | default: | 1285 | default: |
1292 | dev_err(codec->dev, "Unsupported DAI format %d\n", | 1286 | dev_err(codec->dev, "Unsupported DAI format %d\n", |
1293 | fmt & SND_SOC_DAIFMT_FORMAT_MASK); | 1287 | fmt & SND_SOC_DAIFMT_FORMAT_MASK); |