summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorNicolin Chen <b42378@freescale.com>2013-11-29 17:44:39 +0800
committerNicolin Chen <b42378@freescale.com>2013-11-29 18:29:34 +0800
commit2495284a7f44478031816482e3e58a7ce109dc8c (patch)
treec6d56fa8320c76decadba88a0eb5aba97973b386 /sound
parentfbcc9b5b7c142fa8e97c05fd4dd6c787712ae868 (diff)
ENGR00290229 ASoC: fsl: Drop snd_soc_dapm_sync() in imx-wm8962
As DAPM would do the sync() for us, we don't need to handle it by ourselves. And leaving snd_soc_dapm_sync() here is dangerous because it would disable the clock from WM8962 during the short period of the output route changing since we don't leave the alternative route's enanbling to this machine driver but to DAPM core. Acked-by: Wang Shengjiu <b02247@freescale.com> Signed-off-by: Nicolin Chen <b42378@freescale.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/fsl/imx-wm8962.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/fsl/imx-wm8962.c b/sound/soc/fsl/imx-wm8962.c
index 586fe876c04c..0af986a19d8a 100644
--- a/sound/soc/fsl/imx-wm8962.c
+++ b/sound/soc/fsl/imx-wm8962.c
@@ -108,7 +108,6 @@ static int hpjack_status_check(void)
snd_soc_dapm_enable_pin(&priv->codec->dapm, "Ext Spk");
ret = 0;
}
- snd_soc_dapm_sync(&priv->codec->dapm);
envp[0] = "NAME=headphone";
envp[1] = buf;
@@ -154,7 +153,6 @@ static int micjack_status_check(void)
snd_soc_dapm_enable_pin(&priv->codec->dapm, "DMIC");
ret = 0;
}
- snd_soc_dapm_sync(&priv->codec->dapm);
envp[0] = "NAME=microphone";
envp[1] = buf;