diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-23 09:44:38 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-23 09:44:38 -0700 |
| commit | e0c1cae42ee3479ee631328f6076044b7e8d2af2 (patch) | |
| tree | e70fc820a89248cf6006c325723622957f25c183 | |
| parent | 61249ef44b8180ca6c03ab66275344e6462e2b25 (diff) | |
| parent | 727455f34d7b279271e402b1873dc4e42c9c78de (diff) | |
Merge "ASoC: msm_sdw: Avoid initial SSR notifications at bootup"
| -rw-r--r-- | sound/soc/codecs/msm_sdw/msm_sdw_cdc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/codecs/msm_sdw/msm_sdw_cdc.c b/sound/soc/codecs/msm_sdw/msm_sdw_cdc.c index a962f33a85ba..db723e5ec1f4 100644 --- a/sound/soc/codecs/msm_sdw/msm_sdw_cdc.c +++ b/sound/soc/codecs/msm_sdw/msm_sdw_cdc.c @@ -1661,12 +1661,15 @@ static int msm_sdw_notifier_service_cb(struct notifier_block *nb, service_nb); bool adsp_ready = false; unsigned long timeout; + static bool initial_boot = true; pr_debug("%s: Service opcode 0x%lx\n", __func__, opcode); mutex_lock(&msm_sdw->codec_mutex); switch (opcode) { case AUDIO_NOTIFIER_SERVICE_DOWN: + if (initial_boot) + break; msm_sdw->int_mclk1_enabled = false; msm_sdw->dev_up = false; for (i = 0; i < msm_sdw->nr; i++) @@ -1674,6 +1677,8 @@ static int msm_sdw_notifier_service_cb(struct notifier_block *nb, SWR_DEVICE_DOWN, NULL); break; case AUDIO_NOTIFIER_SERVICE_UP: + if (initial_boot) + initial_boot = false; if (!q6core_is_adsp_ready()) { dev_dbg(msm_sdw->dev, "ADSP isn't ready\n"); timeout = jiffies + |