commit 38c3a4e0e1c4dbfc7b9108444a7052a4a81a2397
author Linux Build Service Account <lnxbuild@localhost> Wed May 22 02:56:54 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed May 22 02:56:53 2013 -0700
tree 229e75b3f891287c4e41c29d4840eb0eadd24c67
parent c48b3efdbe8a25d264dcafd69d86a9e05e77c4ce
parent af0085c93e6c254dc169639e6fa62a6a1a37b951

Merge "ASoC: wcd9320: Fix the ANC disable sequence"

sound/soc/codecs/wcd9320.c

diff --git a/sound/soc/codecs/wcd9320.c b/sound/soc/codecs/wcd9320.c
index 8946dce..ab96baf 100644
--- a/sound/soc/codecs/wcd9320.c
+++ b/sound/soc/codecs/wcd9320.c
@@ -3108,7 +3108,7 @@
 		}
 		release_firmware(fw);
 		break;
-	case SND_SOC_DAPM_POST_PMD:
+	case SND_SOC_DAPM_PRE_PMD:
 		msleep(40);
 		snd_soc_update_bits(codec, TAIKO_A_CDC_ANC1_B1_CTL, 0x01, 0x00);
 		snd_soc_update_bits(codec, TAIKO_A_CDC_ANC2_B1_CTL, 0x02, 0x00);
@@ -3209,8 +3209,6 @@
 			snd_soc_update_bits(codec,
 					TAIKO_A_RX_HPH_CNP_EN, 0x30, 0x00);
 			msleep(40);
-		}
-		if (w->shift == 5) {
 			snd_soc_update_bits(codec,
 					TAIKO_A_TX_7_MBHC_EN, 0x80, 00);
 			ret |= taiko_codec_enable_anc(w, kcontrol, event);