commit 1622ee1822e8adb391b55a09e3cd5144bd9fad47
author Mark Brown <broonie@opensource.wolfsonmicro.com> Fri Jun 03 17:13:57 2011 +0100
committer Mark Brown <broonie@opensource.wolfsonmicro.com> Mon Jun 06 12:46:33 2011 +0100
tree e5d5f6a2afc0361dcdd0d96ceaf8fef284ba939a
parent 05d3962cc921c51059df69488c7f70ab8b6a5d88

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>

sound/soc/codecs/wm8915.c

diff --git a/sound/soc/codecs/wm8915.c b/sound/soc/codecs/wm8915.c
index a0b1a72..28fbf07 100644
--- a/sound/soc/codecs/wm8915.c
+++ b/sound/soc/codecs/wm8915.c
@@ -1839,7 +1839,7 @@
 	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);