Merge "asoc: wcd938x: move 500ms after dev_up sets to true"

This commit is contained in:
qctecmdr
2020-10-07 01:58:57 -07:00
committed by Gerrit - the friendly Code Review server

View File

@@ -2184,8 +2184,6 @@ static int wcd938x_event_notify(struct notifier_block *block,
__func__); __func__);
} else { } else {
wcd938x_mbhc_hs_detect(component, mbhc->mbhc_cfg); wcd938x_mbhc_hs_detect(component, mbhc->mbhc_cfg);
if (wcd938x->usbc_hs_status)
mdelay(500);
} }
wcd938x->mbhc->wcd_mbhc.deinit_in_progress = false; wcd938x->mbhc->wcd_mbhc.deinit_in_progress = false;
wcd938x->dev_up = true; wcd938x->dev_up = true;
@@ -2193,6 +2191,8 @@ static int wcd938x_event_notify(struct notifier_block *block,
blocking_notifier_call_chain(&wcd938x->notifier, blocking_notifier_call_chain(&wcd938x->notifier,
WCD938X_EVT_SSR_UP, WCD938X_EVT_SSR_UP,
NULL); NULL);
if (wcd938x->usbc_hs_status)
mdelay(500);
break; break;
case BOLERO_SLV_EVT_CLK_NOTIFY: case BOLERO_SLV_EVT_CLK_NOTIFY:
snd_soc_component_update_bits(component, snd_soc_component_update_bits(component,