diff options
author | Manoj Gangwal <mgangwal@nvidia.com> | 2014-02-26 12:05:29 +0530 |
---|---|---|
committer | Bharat Nihalani <bnihalani@nvidia.com> | 2014-03-07 03:15:47 -0800 |
commit | 926b41d6806b2e56759af05b75dfce875244b6f6 (patch) | |
tree | 1f319cdfa123e24095ae984b12509998943fabef /sound | |
parent | bee06d7ab5ae05c023401f7c591fa1ae42b65539 (diff) |
Asoc:Avoid syncing dapm paths when ignore-suspend is set
This change will prevent re-syncing of dapm paths
when ignore-suspend is set.
Bug 1437986
Change-Id: I051e681ba0e2483148ff8c452af69ca12e1c9943
Signed-off-by: Manoj Gangwal <mgangwal@nvidia.com>
(cherry picked from commit 73492253bb19987a3323f45391442b8398c23fed)
Reviewed-on: http://git-master/r/378217
Reviewed-by: Sumit Bhattacharya <sumitb@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/soc-core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index d56bbea6e75e..7672e72b7d8b 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -610,11 +610,11 @@ int snd_soc_suspend(struct device *dev) snd_soc_dapm_stream_event(&card->rtd[i], SNDRV_PCM_STREAM_CAPTURE, SND_SOC_DAPM_STREAM_SUSPEND); - } - /* Recheck all analogue paths too */ - dapm_mark_io_dirty(&card->dapm); - snd_soc_dapm_sync(&card->dapm); + /* Recheck all analogue paths too */ + dapm_mark_io_dirty(&card->dapm); + snd_soc_dapm_sync(&card->dapm); + } /* suspend all CODECs */ list_for_each_entry(codec, &card->codec_dev_list, card_list) { |