summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-10-28 11:08:01 +0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-11 09:44:25 -0800
commit55c618c61940db0845744db9acce6319f0783252 (patch)
treeda58aa8ec9aa56e4a6062053b281b362dbeaadf6
parent218782d30177214893625e8d6523191caa5e023b (diff)
downloadlinux-stable-55c618c61940db0845744db9acce6319f0783252.tar.gz
linux-stable-55c618c61940db0845744db9acce6319f0783252.tar.bz2
linux-stable-55c618c61940db0845744db9acce6319f0783252.zip
ASoC: wm8711: Fix wrong mask for setting input audio data bit length select
commit 04c57163c8edfbc50e022737014069998ba4fc5f upstream. The Input Audio Data Bit Length Select is controlled by BIT[3:2] of WM8711_IFACE(07h) register. Current code incorrectly masks BIT[1:0] which is for Audio Data Format Select. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--sound/soc/codecs/wm8711.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c
index a537e4af6ae7..15be229b3881 100644
--- a/sound/soc/codecs/wm8711.c
+++ b/sound/soc/codecs/wm8711.c
@@ -150,7 +150,7 @@ static int wm8711_hw_params(struct snd_pcm_substream *substream,
{
struct snd_soc_codec *codec = dai->codec;
struct wm8711_priv *wm8711 = snd_soc_codec_get_drvdata(codec);
- u16 iface = snd_soc_read(codec, WM8711_IFACE) & 0xfffc;
+ u16 iface = snd_soc_read(codec, WM8711_IFACE) & 0xfff3;
int i = get_coeff(wm8711->sysclk, params_rate(params));
u16 srate = (coeff_div[i].sr << 2) |
(coeff_div[i].bosr << 1) | coeff_div[i].usb;