diff options
| author | Axel Lin <axel.lin@ingics.com> | 2012-12-21 09:28:37 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-21 10:32:20 +0100 |
| commit | 2a5f431592343b78896013b055582f94c12a5049 (patch) | |
| tree | ca11b5284f8a19c0fbf59756fb77f05fa53a8f05 | |
| parent | Merge remote-tracking branch 'asoc/topic/tpa6130a2' into asoc-next (diff) | |
| download | linux-2a5f431592343b78896013b055582f94c12a5049.tar.xz linux-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
| -rw-r--r-- | sound/soc/codecs/wm2200.c | 2 |
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; } |