diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2020-12-11 14:07:19 -0800 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2020-12-11 14:07:19 -0800 |
| commit | d9b7a6a76b366cc1985075e2843cf54ef9375209 (patch) | |
| tree | 75fcc46279258826d6c684dbf531bc3d0f647fc4 | |
| parent | 861f2812e0259737f7abadaa247f0e9719e03c5b (diff) | |
| parent | 83dccdc403d4e31e47b000dc4ccc9b176f95c8ad (diff) | |
| download | msm-extra-d9b7a6a76b366cc1985075e2843cf54ef9375209.tar.gz | |
Merge android-msm-pixel-4.14-rvc-qpr2 into android-msm-pixel-4.14android-s-preview-1_r0.4android-s-preview-1_r0.3android-msm-sunfish-4.14-s-preview-1android-msm-coral-4.14-s-preview-1
SBMerger: 325904710
Change-Id: Ibd397d51eeefa5d072d9a364a5a2f41606992239
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | 4.0/asoc/msm-pcm-routing-v2.c | 5 | ||||
| -rw-r--r-- | asoc/codecs/wcd-mbhc-v2.c | 6 | ||||
| -rw-r--r-- | asoc/codecs/wcd-mbhc-v2.h | 1 |
3 files changed, 7 insertions, 5 deletions
diff --git a/4.0/asoc/msm-pcm-routing-v2.c b/4.0/asoc/msm-pcm-routing-v2.c index efaa4ef2..01505a37 100644 --- a/4.0/asoc/msm-pcm-routing-v2.c +++ b/4.0/asoc/msm-pcm-routing-v2.c @@ -22553,6 +22553,7 @@ static int msm_routing_get_lsm_app_type_cfg_control( kcontrol->private_value)->shift; int i = 0, j = 0; + mutex_lock(&routing_lock); ucontrol->value.integer.value[i] = num_app_cfg_types; for (j = 0; j < num_app_cfg_types; ++j) { @@ -22566,6 +22567,7 @@ static int msm_routing_get_lsm_app_type_cfg_control( ucontrol->value.integer.value[++i] = lsm_app_type_cfg[j].num_out_channels; } + mutex_unlock(&routing_lock); return 0; } @@ -22577,9 +22579,11 @@ static int msm_routing_put_lsm_app_type_cfg_control( kcontrol->private_value)->shift; int i = 0, j; + mutex_lock(&routing_lock); if (ucontrol->value.integer.value[0] > MAX_APP_TYPES) { pr_err("%s: number of app types exceed the max supported\n", __func__); + mutex_unlock(&routing_lock); return -EINVAL; } @@ -22600,6 +22604,7 @@ static int msm_routing_put_lsm_app_type_cfg_control( ucontrol->value.integer.value[i++]; } + mutex_unlock(&routing_lock); return 0; } diff --git a/asoc/codecs/wcd-mbhc-v2.c b/asoc/codecs/wcd-mbhc-v2.c index 8db1f419..68e20888 100644 --- a/asoc/codecs/wcd-mbhc-v2.c +++ b/asoc/codecs/wcd-mbhc-v2.c @@ -695,10 +695,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 1e4173d1..906e4426 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 |