summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSylwester Nawrocki <s.nawrocki@samsung.com>2013-03-13 20:02:57 +0100
committerChanho Park <chanho61.park@samsung.com>2014-03-20 17:32:25 +0900
commit37e4e596655b01344f3c0e71378af4bad37dc56b (patch)
treebe54e11162b05555b3f893582b34e9567f09e151
parent6d73862f848ecee3616834b002c23c3abac43f36 (diff)
downloadlinux-3.10-37e4e596655b01344f3c0e71378af4bad37dc56b.tar.gz
linux-3.10-37e4e596655b01344f3c0e71378af4bad37dc56b.tar.bz2
linux-3.10-37e4e596655b01344f3c0e71378af4bad37dc56b.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>
-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,