lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'asoc/fix/wm5100' into tmp

Browse Source
This commit is contained in:
Mark Brown
2013-01-10 12:22:30 +00:00
parent 921c038d87 5f960294e2
commit 49a170bcf2
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sound/soc/codecs/wm5100.c
View File

@@ -1279,15 +1279,9 @@ static int wm5100_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
case SND_SOC_DAIFMT_DSP_A: case SND_SOC_DAIFMT_DSP_A:
mask = 0; mask = 0;
break; break;
case SND_SOC_DAIFMT_DSP_B:
mask = 1;
break;
case SND_SOC_DAIFMT_I2S: case SND_SOC_DAIFMT_I2S:
mask = 2; mask = 2;
break; break;
case SND_SOC_DAIFMT_LEFT_J:
mask = 3;
break;
default: default:
dev_err(codec->dev, "Unsupported DAI format %d\n", dev_err(codec->dev, "Unsupported DAI format %d\n",
fmt & SND_SOC_DAIFMT_FORMAT_MASK); fmt & SND_SOC_DAIFMT_FORMAT_MASK);