diff options
| author | Nicolin Chen <b42378@freescale.com> | 2013-11-29 17:44:39 +0800 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@nxp.com> | 2016-01-14 11:00:14 -0600 |
| commit | 57e06770562c07ea9b7860e91b1d61d2438721cc (patch) | |
| tree | 8eb22bc9c7697f6e577401f58ea2b103f16e4fd0 /sound | |
| parent | e1626ddf4f4d2e6d95a7c78d5d9f5844c8a17169 (diff) | |
MLK-11479-08 ASoC: fsl: Drop snd_soc_dapm_sync() in imx-wm8962
cherry-pick below patch from v3.14.y:
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>
(cherry picked from commit c4dcde0b5119262cbb75c5136422af2071bffbda)
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/fsl/imx-wm8962.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/fsl/imx-wm8962.c b/sound/soc/fsl/imx-wm8962.c index 8139feb69445..8ce9cec08e62 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 *data) 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 *data) 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; |