diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-10 12:22:30 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-10 12:22:30 +0000 |
| commit | 49a170bcf28af5ef372cdbed7750ba8d4162bb0e (patch) | |
| tree | c516c7e5ad8f437bfd9dc0be647e1637e3c298b9 /sound | |
| parent | 921c038d87bc02accc8c5904ae080d6b67567974 (diff) | |
| parent | 5f960294e2031d12f10c8488c3446fecbf59628d (diff) | |
| download | linux-49a170bcf28af5ef372cdbed7750ba8d4162bb0e.tar.gz linux-49a170bcf28af5ef372cdbed7750ba8d4162bb0e.tar.bz2 linux-49a170bcf28af5ef372cdbed7750ba8d4162bb0e.zip | |
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) case SND_SOC_DAIFMT_DSP_A: mask = 0; break; - case SND_SOC_DAIFMT_DSP_B: - mask = 1; - break; case SND_SOC_DAIFMT_I2S: mask = 2; break; - case SND_SOC_DAIFMT_LEFT_J: - mask = 3; - break; default: dev_err(codec->dev, "Unsupported DAI format %d\n", fmt & SND_SOC_DAIFMT_FORMAT_MASK); |