summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorSylwester Nawrocki <s.nawrocki@samsung.com>2013-03-13 20:02:57 +0100
committerMarek Szyprowski <m.szyprowski@samsung.com>2014-05-15 07:18:45 +0200
commit74f2bb35e1f5b45dbb3e07995be6ae49113a486a (patch)
tree8f8e947d4147a73a795cbb5eb007840436425332 /sound
parent6da59c032877e4f64ae03a9f1e85b93153bd2b33 (diff)
downloadlinux-3.10-74f2bb35e1f5b45dbb3e07995be6ae49113a486a.tar.gz
linux-3.10-74f2bb35e1f5b45dbb3e07995be6ae49113a486a.tar.bz2
linux-3.10-74f2bb35e1f5b45dbb3e07995be6ae49113a486a.zip
sound: exynos4_wm1811: Disable suspend code for uninitialized AIF
Currently there is only AIF1 interface initialized in this driver. Temporarily disable code that tries to suspend AIF2 until support for this interface is added. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/samsung/exynos4_wm1811.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/samsung/exynos4_wm1811.c b/sound/soc/samsung/exynos4_wm1811.c
index fb6385fb11c..a1dbce6627c 100644
--- a/sound/soc/samsung/exynos4_wm1811.c
+++ b/sound/soc/samsung/exynos4_wm1811.c
@@ -1083,6 +1083,9 @@ static int machine_card_suspend_post(struct snd_soc_card *card)
/* change sysclk from pll out of mclk1 to mclk2
to disable mclk1 from AP */
dev_info(codec->dev, "use mclk2 and disable fll");
+
+/* Disable this code until support for AIF2 interface is added. */
+#if 0
ret = snd_soc_dai_set_sysclk(aif2_dai,
WM8994_SYSCLK_MCLK2,
CODEC_CLK32K,
@@ -1095,7 +1098,7 @@ static int machine_card_suspend_post(struct snd_soc_card *card)
if (ret < 0)
dev_err(codec->dev,
"Unable to stop FLL2: %d\n", ret);
-
+#endif
ret = snd_soc_dai_set_sysclk(aif1_dai,
WM8994_SYSCLK_MCLK2,
CODEC_CLK32K,