Merge "asoc: bolero: check if va is enabled when register/deregister wakeup irq" into audio-drivers.lnx.5.0

This commit is contained in:
Linux Build Service Account
2020-04-16 02:11:00 -07:00
committed by Gerrit - the friendly Code Review server

View File

@@ -2449,7 +2449,8 @@ static int tx_macro_register_event_listener(struct snd_soc_component *component,
"%s: priv is null for macro!\n", __func__);
return -EINVAL;
}
if (tx_priv->swr_ctrl_data && !tx_priv->tx_swr_clk_cnt) {
if (tx_priv->swr_ctrl_data &&
(!tx_priv->tx_swr_clk_cnt || !tx_priv->va_swr_clk_cnt)) {
if (enable) {
ret = swrm_wcd_notify(
tx_priv->swr_ctrl_data[0].tx_swr_pdev,