summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-06-03 17:13:57 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-06-06 12:46:33 +0100
commit1622ee1822e8adb391b55a09e3cd5144bd9fad47 (patch)
treee5d5f6a2afc0361dcdd0d96ceaf8fef284ba939a /sound
parent05d3962cc921c51059df69488c7f70ab8b6a5d88 (diff)
downloadlinux-1622ee1822e8adb391b55a09e3cd5144bd9fad47.tar.bz2
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8915.c2
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);