diff options
| author | Mark Brown | 2011-06-03 18:13:57 +0200 |
|---|---|---|
| committer | Mark Brown | 2011-06-06 13:46:33 +0200 |
| commit | 1622ee1822e8adb391b55a09e3cd5144bd9fad47 (patch) | |
| tree | e5d5f6a2afc0361dcdd0d96ceaf8fef284ba939a | |
| parent | Merge branch 'for-3.0' of git://git.kernel.org/pub/scm/linux/kernel/git/broon... (diff) | |
| download | kernel-qcow2-linux-1622ee1822e8adb391b55a09e3cd5144bd9fad47.tar.gz kernel-qcow2-linux-1622ee1822e8adb391b55a09e3cd5144bd9fad47.tar.xz kernel-qcow2-linux-1622ee1822e8adb391b55a09e3cd5144bd9fad47.zip | |
ASoC: Only update SYSCLK_ENA when pausing WM8915 SYSCLK
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
| -rw-r--r-- | sound/soc/codecs/wm8915.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8915.c b/sound/soc/codecs/wm8915.c index a0b1a7278284..28fbf072b9c0 100644 --- a/sound/soc/codecs/wm8915.c +++ b/sound/soc/codecs/wm8915.c @@ -1839,7 +1839,7 @@ static int wm8915_set_sysclk(struct snd_soc_dai *dai, int old; /* Disable SYSCLK while we reconfigure */ - old = snd_soc_read(codec, WM8915_AIF_CLOCKING_1); + old = snd_soc_read(codec, WM8915_AIF_CLOCKING_1) & WM8915_SYSCLK_ENA; snd_soc_update_bits(codec, WM8915_AIF_CLOCKING_1, WM8915_SYSCLK_ENA, 0); |