diff options
| author | Mark Brown | 2011-12-10 20:01:33 +0100 |
|---|---|---|
| committer | Mark Brown | 2011-12-10 20:01:33 +0100 |
| commit | f04b8d6ecef2c981e9d7b2c5ae358240a02b6974 (patch) | |
| tree | 8694197eff6988e21e4d981a8b3f1b820fb42eae /sound/soc/codecs/wm8996.c | |
| parent | ASoC: Convert wm8770 to devm_kzalloc() (diff) | |
| parent | ASoC: Fix WM8996 24.576MHz clock operation (diff) | |
| download | kernel-qcow2-linux-f04b8d6ecef2c981e9d7b2c5ae358240a02b6974.tar.gz kernel-qcow2-linux-f04b8d6ecef2c981e9d7b2c5ae358240a02b6974.tar.xz kernel-qcow2-linux-f04b8d6ecef2c981e9d7b2c5ae358240a02b6974.zip | |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound/soc/codecs/wm8996.c')
| -rw-r--r-- | sound/soc/codecs/wm8996.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index 41cc9d2d5ae9..8f88f5a9c985 100644 --- a/sound/soc/codecs/wm8996.c +++ b/sound/soc/codecs/wm8996.c @@ -2043,6 +2043,7 @@ static int wm8996_set_sysclk(struct snd_soc_dai *dai, 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); |