Merge "asoc: bolero: Call swr device down before setting ssr down"

This commit is contained in:
Linux Build Service Account 2019-01-08 05:31:57 -08:00 • committed by Gerrit - the friendly Code Review server
commit a0b8337922
3 changed files with 6 additions and 6 deletions

View file

@ -1237,10 +1237,10 @@ static int rx_macro_event_handler(struct snd_soc_component *component,
rx_priv->dev_up = false;
swrm_wcd_notify(
rx_priv->swr_ctrl_data[0].rx_swr_pdev,
SWR_DEVICE_SSR_DOWN, NULL);
SWR_DEVICE_DOWN, NULL);
swrm_wcd_notify(
rx_priv->swr_ctrl_data[0].rx_swr_pdev,
SWR_DEVICE_DOWN, NULL);
SWR_DEVICE_SSR_DOWN, NULL);
break;
case BOLERO_MACRO_EVT_SSR_UP:
rx_priv->dev_up = true;

View file

@ -312,10 +312,10 @@ static int tx_macro_event_handler(struct snd_soc_component *component,
case BOLERO_MACRO_EVT_SSR_DOWN:
swrm_wcd_notify(
tx_priv->swr_ctrl_data[0].tx_swr_pdev,
SWR_DEVICE_SSR_DOWN, NULL);
SWR_DEVICE_DOWN, NULL);
swrm_wcd_notify(
tx_priv->swr_ctrl_data[0].tx_swr_pdev,
SWR_DEVICE_DOWN, NULL);
SWR_DEVICE_SSR_DOWN, NULL);
break;
case BOLERO_MACRO_EVT_SSR_UP:
/* reset swr after ssr/pdr */

View file

@ -924,10 +924,10 @@ static int wsa_macro_event_handler(struct snd_soc_component *component,
case BOLERO_MACRO_EVT_SSR_DOWN:
swrm_wcd_notify(
wsa_priv->swr_ctrl_data[0].wsa_swr_pdev,
SWR_DEVICE_SSR_DOWN, NULL);
SWR_DEVICE_DOWN, NULL);
swrm_wcd_notify(
wsa_priv->swr_ctrl_data[0].wsa_swr_pdev,
SWR_DEVICE_DOWN, NULL);
SWR_DEVICE_SSR_DOWN, NULL);
break;
case BOLERO_MACRO_EVT_SSR_UP:
/* reset swr after ssr/pdr */