samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "asoc: codecs: add a null pointer check in mbhc driver"

Browse Source
This commit is contained in:
Linux Build Service Account
2018-03-02 23:16:32 -08:00
committed by Gerrit - the friendly Code Review server
parent d156f031de 76c5b45e7f
commit 3162dd4812
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
asoc/codecs/wcd-mbhc-legacy.c
View File

@@ -1,4 +1,4 @@
/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved. /* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@@ -533,7 +533,8 @@ correct_plug_type:
mbhc->hs_detect_work_stop); mbhc->hs_detect_work_stop);
wcd_enable_curr_micbias(mbhc, wcd_enable_curr_micbias(mbhc,
WCD_MBHC_EN_NONE); WCD_MBHC_EN_NONE);
if (mbhc->micbias_enable) { if (mbhc->mbhc_cb->mbhc_micb_ctrl_thr_mic &&
mbhc->micbias_enable) {
mbhc->mbhc_cb->mbhc_micb_ctrl_thr_mic( mbhc->mbhc_cb->mbhc_micb_ctrl_thr_mic(
mbhc->codec, MIC_BIAS_2, false); mbhc->codec, MIC_BIAS_2, false);
if (mbhc->mbhc_cb->set_micbias_value) if (mbhc->mbhc_cb->set_micbias_value)
@@ -558,7 +559,8 @@ correct_plug_type:
mbhc->hs_detect_work_stop); mbhc->hs_detect_work_stop);
wcd_enable_curr_micbias(mbhc, wcd_enable_curr_micbias(mbhc,
WCD_MBHC_EN_NONE); WCD_MBHC_EN_NONE);
if (mbhc->micbias_enable) { if (mbhc->mbhc_cb->mbhc_micb_ctrl_thr_mic &&
mbhc->micbias_enable) {
mbhc->mbhc_cb->mbhc_micb_ctrl_thr_mic( mbhc->mbhc_cb->mbhc_micb_ctrl_thr_mic(
mbhc->codec, MIC_BIAS_2, false); mbhc->codec, MIC_BIAS_2, false);
if (mbhc->mbhc_cb->set_micbias_value) if (mbhc->mbhc_cb->set_micbias_value)