diff options
| author | Axel Lin <axel.lin@ingics.com> | 2012-12-21 16:28:37 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-17 08:50:54 -0800 |
| commit | bc85643d2ff065c0303a1a0edfd748da4805295e (patch) | |
| tree | 698e78543d375bce8f70d3d9303383d09dc44944 /sound | |
| parent | 4548554e7ca5192d5905a11219afb7de439b17d8 (diff) | |
| download | linux-3.10-bc85643d2ff065c0303a1a0edfd748da4805295e.tar.gz linux-3.10-bc85643d2ff065c0303a1a0edfd748da4805295e.tar.bz2 linux-3.10-bc85643d2ff065c0303a1a0edfd748da4805295e.zip | |
ASoC: wm2200: Fix setting dai format in wm2200_set_fmt
commit 2a5f431592343b78896013b055582f94c12a5049 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
| -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 c8bff6da532..201fc583217 100644 --- a/sound/soc/codecs/wm2200.c +++ b/sound/soc/codecs/wm2200.c @@ -1440,7 +1440,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; } |