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 NULL check before calling bcs_enable callback function"

Browse Source
This commit is contained in:
qctecmdr
2019-11-20 06:45:37 -08:00
committed by Gerrit - the friendly Code Review server
parent 7ae9fa55cd 54fe9be449
commit ce47979cec
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
asoc/codecs/wcd-mbhc-adc.c
View File

@@ -694,7 +694,8 @@ correct_plug_type:
*/ */
if (plug_type == MBHC_PLUG_TYPE_HEADSET || if (plug_type == MBHC_PLUG_TYPE_HEADSET ||
plug_type == MBHC_PLUG_TYPE_HEADPHONE) plug_type == MBHC_PLUG_TYPE_HEADPHONE)
mbhc->mbhc_cb->bcs_enable(mbhc, false); if (mbhc->mbhc_cb->bcs_enable)
mbhc->mbhc_cb->bcs_enable(mbhc, false);
timeout = jiffies + msecs_to_jiffies(HS_DETECT_PLUG_TIME_MS); timeout = jiffies + msecs_to_jiffies(HS_DETECT_PLUG_TIME_MS);
while (!time_after(jiffies, timeout)) { while (!time_after(jiffies, timeout)) {
@@ -842,7 +843,8 @@ correct_plug_type:
} }
if ((plug_type == MBHC_PLUG_TYPE_HEADSET || if ((plug_type == MBHC_PLUG_TYPE_HEADSET ||
plug_type == MBHC_PLUG_TYPE_HEADPHONE)) plug_type == MBHC_PLUG_TYPE_HEADPHONE))
mbhc->mbhc_cb->bcs_enable(mbhc, true); if (mbhc->mbhc_cb->bcs_enable)
mbhc->mbhc_cb->bcs_enable(mbhc, true);
if (!wrk_complete) { if (!wrk_complete) {
/* /*