summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2012-12-21 16:28:37 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-21 09:32:20 +0000
commit2a5f431592343b78896013b055582f94c12a5049 (patch)
treeca11b5284f8a19c0fbf59756fb77f05fa53a8f05 /sound
parent8246b5b03ef4ab6f29ad8edad859c74b124323cb (diff)
downloadlinux-stable-2a5f431592343b78896013b055582f94c12a5049.tar.gz
linux-stable-2a5f431592343b78896013b055582f94c12a5049.tar.bz2
linux-stable-2a5f431592343b78896013b055582f94c12a5049.zip
ASoC: wm2200: Fix setting dai format in wm2200_set_fmt
According to the defines in wm2200.h: /* * R1284 (0x504) - Audio IF 1_5 */ We should not left shift 1 bit for fmt_val when setting dai format. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: stable@vger.kernel.org
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm2200.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c
index afcf31df77e0..a12fc2fa3971 100644
--- a/sound/soc/codecs/wm2200.c
+++ b/sound/soc/codecs/wm2200.c
@@ -1626,7 +1626,7 @@ static int wm2200_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
WM2200_AIF1TX_LRCLK_MSTR | WM2200_AIF1TX_LRCLK_INV,
lrclk);
snd_soc_update_bits(codec, WM2200_AUDIO_IF_1_5,
- WM2200_AIF1_FMT_MASK << 1, fmt_val << 1);
+ WM2200_AIF1_FMT_MASK, fmt_val);
return 0;
}