commit 6f3359a34c19edc3352cbea66be1a57390d02f23
author Linux Build Service Account <lnxbuild@localhost> Thu Apr 05 13:24:42 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Apr 05 13:24:42 2018 -0700
tree abff003c0ede9219bde32af40e677499a02ceef6
parent 69f2525fcec747da46e373ad764635b01f41247a
parent 831beb7dfd6df3b06fe9af38237fd734eda77d15

Merge "asoc: codecs: msm_sdw: Fix serv_reg ack timeout in PDR"

asoc/codecs/msm_sdw/msm_sdw_cdc.c

diff --git a/asoc/codecs/msm_sdw/msm_sdw_cdc.c b/asoc/codecs/msm_sdw/msm_sdw_cdc.c
index 3dd74f7..21c03ae 100644
--- a/asoc/codecs/msm_sdw/msm_sdw_cdc.c
+++ b/asoc/codecs/msm_sdw/msm_sdw_cdc.c
@@ -1758,6 +1758,8 @@
 		}
 		msm_sdw->int_mclk1_enabled = false;
 		msm_sdw->dev_up = false;
+		snd_soc_card_change_online_state(
+			msm_sdw->codec->component.card, 0);
 		for (i = 0; i < msm_sdw->nr; i++)
 			swrm_wcd_notify(msm_sdw->sdw_ctrl_data[i].sdw_pdev,
 					SWR_DEVICE_DOWN, NULL);
@@ -1792,6 +1794,8 @@
 			regcache_sync(msm_sdw->regmap);
 			msm_sdw_set_spkr_mode(msm_sdw->codec,
 					      msm_sdw->spkr_mode);
+			snd_soc_card_change_online_state(
+				msm_sdw->codec->component.card, 1);
 		}
 		break;
 	default: