diff options
| author | Olof Johansson <olof@lixom.net> | 2013-12-29 00:37:03 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-12-29 00:38:16 -0500 |
| commit | fe5a365cdb9cc925d5ce86a5bb4509dca57f3894 (patch) | |
| tree | 8dd536be0e16e86109295142edd1ef1fd18c2e98 /sound/soc/codecs/wm8904.c | |
| parent | 4d77ce6c1fcae189dcd6fb0c7342f1c901b50a70 (diff) | |
| parent | 413541dd66d51f791a0b169d9b9014e4f56be13c (diff) | |
Merge tag 'v3.13-rc5' into next/boards
Need a newer base version to get a regulator fix for Samsung platforms that
they enable building in a defconfig.
Linux 3.13-rc5
Diffstat (limited to 'sound/soc/codecs/wm8904.c')
| -rw-r--r-- | sound/soc/codecs/wm8904.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c index 3938fb1c203e..53bbfac6a83a 100644 --- a/sound/soc/codecs/wm8904.c +++ b/sound/soc/codecs/wm8904.c | |||
| @@ -1444,7 +1444,7 @@ static int wm8904_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) | |||
| 1444 | 1444 | ||
| 1445 | switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { | 1445 | switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { |
| 1446 | case SND_SOC_DAIFMT_DSP_B: | 1446 | case SND_SOC_DAIFMT_DSP_B: |
| 1447 | aif1 |= WM8904_AIF_LRCLK_INV; | 1447 | aif1 |= 0x3 | WM8904_AIF_LRCLK_INV; |
| 1448 | case SND_SOC_DAIFMT_DSP_A: | 1448 | case SND_SOC_DAIFMT_DSP_A: |
| 1449 | aif1 |= 0x3; | 1449 | aif1 |= 0x3; |
| 1450 | break; | 1450 | break; |