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-10 14:19:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "ASoC: wcd938x: Fix headset detection during SSR/PDR"

Browse source
This commit is contained in:
qctecmdr 2020-04-08 21:02:07 -07:00 • committed by Gerrit - the friendly Code Review server
commit db7ff12b0c
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
asoc/codecs/wcd937x/wcd937x.c
View file

@ -1589,6 +1589,7 @@ static int wcd937x_event_notify(struct notifier_block *block,
0x80, 0x00);
break;
case BOLERO_WCD_EVT_SSR_DOWN:
wcd937x->mbhc->wcd_mbhc.deinit_in_progress = true;
mbhc = &wcd937x->mbhc->wcd_mbhc;
wcd937x_mbhc_ssr_down(wcd937x->mbhc, component);
wcd937x_reset_low(wcd937x->dev);
@ -1612,6 +1613,7 @@ static int wcd937x_event_notify(struct notifier_block *block,
} else {
wcd937x_mbhc_hs_detect(component, mbhc->mbhc_cfg);
}
wcd937x->mbhc->wcd_mbhc.deinit_in_progress = false;
break;
default:
dev_err(component->dev, "%s: invalid event %d\n", __func__,

2
asoc/codecs/wcd938x/wcd938x.c
View file

@ -2032,6 +2032,7 @@ static int wcd938x_event_notify(struct notifier_block *block,
break;
case BOLERO_WCD_EVT_SSR_DOWN:
wcd938x->dev_up = false;
wcd938x->mbhc->wcd_mbhc.deinit_in_progress = true;
mbhc = &wcd938x->mbhc->wcd_mbhc;
wcd938x_mbhc_ssr_down(wcd938x->mbhc, component);
wcd938x_reset_low(wcd938x->dev);
@ -2056,6 +2057,7 @@ static int wcd938x_event_notify(struct notifier_block *block,
} else {
wcd938x_mbhc_hs_detect(component, mbhc->mbhc_cfg);
}
wcd938x->mbhc->wcd_mbhc.deinit_in_progress = false;
wcd938x->dev_up = true;
break;
case BOLERO_WCD_EVT_CLK_NOTIFY: