diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-06-26 04:15:32 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-06-26 04:15:31 -0700 |
| commit | e98ecf07c356bfce65b35f49dba2dd672ecd5b56 (patch) | |
| tree | 03eacd50c70059d9623cde34fd6f8a563b554c6f /sound/soc | |
| parent | 29ed5083b7e2a7a0c411037428366067573ec783 (diff) | |
| parent | ac549a1aa1cb46382e18729a3e24142ac29bf390 (diff) | |
Merge "ASoC: mbhc: fix the no audio issue in the voice call"
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wcd-mbhc-v2.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sound/soc/codecs/wcd-mbhc-v2.c b/sound/soc/codecs/wcd-mbhc-v2.c index 65188fa37e91..2ee75a7829f3 100644 --- a/sound/soc/codecs/wcd-mbhc-v2.c +++ b/sound/soc/codecs/wcd-mbhc-v2.c @@ -866,10 +866,6 @@ static void wcd_mbhc_swch_irq_handler(struct wcd_mbhc *mbhc) snd_soc_update_bits(codec, MSM8X16_WCD_A_ANALOG_MBHC_FSM_CTL, 0xB0, 0x00); - /* Make sure MASTER_BIAS_CTL is enabled */ - snd_soc_update_bits(codec, - MSM8X16_WCD_A_ANALOG_MASTER_BIAS_CTL, - 0x30, 0x00); if (mbhc->current_plug == MBHC_PLUG_TYPE_HEADPHONE) { wcd_mbhc_report_plug(mbhc, 0, SND_JACK_HEADPHONE); mbhc->btn_press_intr = false; @@ -898,10 +894,6 @@ static void wcd_mbhc_swch_irq_handler(struct wcd_mbhc *mbhc) snd_soc_update_bits(codec, MSM8X16_WCD_A_ANALOG_MBHC_FSM_CTL, 0xB0, 0x00); - /* Make sure MASTER_BIAS_CTL is enabled */ - snd_soc_update_bits(codec, - MSM8X16_WCD_A_ANALOG_MASTER_BIAS_CTL, - 0x30, 0x00); } mbhc->in_swch_irq_handler = false; |