Merge "Revert "ASoC: wcd-mbhc: Fix plug removal detection from extension cable"" (6c32f500) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/codecs/wcd-mbhc-v2.c

+0 −14

Original line number	Diff line number	Diff line
		@@ -1377,15 +1377,6 @@ exit:
		micbias2 = mbhc->mbhc_cb->micbias_enable_status(mbhc,
		MIC_BIAS_2);
		}

		if (mbhc->mbhc_cfg->detect_extn_cable &&
		((plug_type == MBHC_PLUG_TYPE_HEADPHONE) \|\|
		(plug_type == MBHC_PLUG_TYPE_HEADSET)) &&
		!mbhc->hs_detect_work_stop) {
		WCD_MBHC_RSC_LOCK(mbhc);
		wcd_mbhc_hs_elec_irq(mbhc, WCD_MBHC_ELEC_HS_REM, true);
		WCD_MBHC_RSC_UNLOCK(mbhc);
		}
		if (mbhc->mbhc_cb->set_cap_mode)
		mbhc->mbhc_cb->set_cap_mode(codec, micbias1, micbias2);

		@@ -1744,10 +1735,6 @@ static irqreturn_t wcd_mbhc_hs_rem_irq(int irq, void *data)
		}
		} while (!time_after(jiffies, timeout));

		if (wcd_swch_level_remove(mbhc)) {
		pr_debug("%s: Switch level is low ", __func__);
		goto exit;
		}
		pr_debug("%s: headset %s actually removed\n", __func__,
		removed ? "" : "not ");

		@@ -1782,7 +1769,6 @@ static irqreturn_t wcd_mbhc_hs_rem_irq(int irq, void *data)
		}
		}
		}
		exit:
		WCD_MBHC_RSC_UNLOCK(mbhc);
		pr_debug("%s: leave\n", __func__);
		return IRQ_HANDLED;