projects
/
GitHub
/
moto-9609
/
android_kernel_motorola_exynos9610.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8246b5b
)
ASoC: wm2200: Fix setting dai format in wm2200_set_fmt
author
Axel Lin
<axel.lin@ingics.com>
Fri, 21 Dec 2012 08:28:37 +0000
(16:28 +0800)
committer
Mark Brown
<broonie@opensource.wolfsonmicro.com>
Fri, 21 Dec 2012 09:32:20 +0000
(09:32 +0000)
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
sound/soc/codecs/wm2200.c
patch
|
blob
|
blame
|
history
diff --git
a/sound/soc/codecs/wm2200.c
b/sound/soc/codecs/wm2200.c
index afcf31df77e06efe19c709630f53990741348227..a12fc2fa3971c8fc1ac6f1ba25c4e458f75ed19b 100644
(file)
--- 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;
}