A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 15:11:48 -04:00
Code Issues Projects Releases Packages 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
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 ||
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);
while (!time_after(jiffies, timeout)) {
@ -842,7 +843,8 @@ correct_plug_type:
}
if ((plug_type == MBHC_PLUG_TYPE_HEADSET ||
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) {
/*