diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2020-12-04 14:10:07 -0800 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2020-12-04 14:10:07 -0800 |
| commit | 34c43c1e924ab00b8d947e9b606e7ea56f11de13 (patch) | |
| tree | 3808b86a39242c0e3aa36123e14aa3a9376d4ac2 | |
| parent | f49c717db2d431ea5878f72f5f696f4b803ea3c2 (diff) | |
| parent | 2bf87c22b74af38c2aca4c376b71734a7374902c (diff) | |
| download | msm-extra-android-msm-crosshatch-4.9-s-preview-1.tar.gz | |
Merge android-msm-pixel-4.9-rvc-qpr2 into android-msm-pixel-4.9android-s-preview-1_r0.2android-s-preview-1_r0.1android-msm-crosshatch-4.9-s-preview-1android-msm-bonito-4.9-s-preview-1
SBMerger: 325904710
Change-Id: I2cc4bba659fb360a55ebb5f79b3dbfe4e5dd8b31
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | asoc/codecs/wcd-mbhc-v2.c | 6 | ||||
| -rw-r--r-- | asoc/codecs/wcd-mbhc-v2.h | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/asoc/codecs/wcd-mbhc-v2.c b/asoc/codecs/wcd-mbhc-v2.c index 42ab7c80..77dfa3c1 100644 --- a/asoc/codecs/wcd-mbhc-v2.c +++ b/asoc/codecs/wcd-mbhc-v2.c @@ -711,10 +711,8 @@ void wcd_mbhc_report_plug(struct wcd_mbhc *mbhc, int insertion, &mbhc->zl, &mbhc->zr); WCD_MBHC_REG_UPDATE_BITS(WCD_MBHC_FSM_EN, fsm_en); - if ((mbhc->zl > mbhc->mbhc_cfg->linein_th && - mbhc->zl < MAX_IMPED) && - (mbhc->zr > mbhc->mbhc_cfg->linein_th && - mbhc->zr < MAX_IMPED) && + if ((mbhc->zl > mbhc->mbhc_cfg->linein_th) && + (mbhc->zr > mbhc->mbhc_cfg->linein_th) && (jack_type == SND_JACK_HEADPHONE)) { jack_type = SND_JACK_LINEOUT; mbhc->force_linein = true; diff --git a/asoc/codecs/wcd-mbhc-v2.h b/asoc/codecs/wcd-mbhc-v2.h index 7ddd92f0..36a41ddf 100644 --- a/asoc/codecs/wcd-mbhc-v2.h +++ b/asoc/codecs/wcd-mbhc-v2.h @@ -148,7 +148,6 @@ do { \ #define FW_READ_ATTEMPTS 15 #define FW_READ_TIMEOUT 4000000 #define FAKE_REM_RETRY_ATTEMPTS 3 -#define MAX_IMPED 60000 #define WCD_MBHC_BTN_PRESS_COMPL_TIMEOUT_MS 50 #define ANC_DETECT_RETRY_CNT 7 |