| commit | f04b8d6ecef2c981e9d7b2c5ae358240a02b6974 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Sun Dec 11 03:01:33 2011 +0800 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Sun Dec 11 03:01:33 2011 +0800 |
| tree | 8694197eff6988e21e4d981a8b3f1b820fb42eae | |
| parent | 3025ae45d6d905c8e973bba59d6f9a1be0da734d [diff] | |
| parent | 37d5993c5cc9bc83762ae1b5bd287438022e8afe [diff] |
Merge branch 'for-3.2' into for-3.3
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index 41cc9d2..8f88f5a 100644 --- a/sound/soc/codecs/wm8996.c +++ b/sound/soc/codecs/wm8996.c
@@ -2043,6 +2043,7 @@ break; case 24576000: ratediv = WM8996_SYSCLK_DIV; + wm8996->sysclk /= 2; case 12288000: snd_soc_update_bits(codec, WM8996_AIF_RATE, WM8996_SYSCLK_RATE, WM8996_SYSCLK_RATE);