aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r--sound/soc/soc-core.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index f219b2f7ee68..f6eec782c61e 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -591,7 +591,7 @@ int snd_soc_suspend(struct device *dev)
591 591
592 /* close any waiting streams and save state */ 592 /* close any waiting streams and save state */
593 for (i = 0; i < card->num_rtd; i++) { 593 for (i = 0; i < card->num_rtd; i++) {
594 flush_delayed_work_sync(&card->rtd[i].delayed_work); 594 flush_delayed_work(&card->rtd[i].delayed_work);
595 card->rtd[i].codec->dapm.suspend_bias_level = card->rtd[i].codec->dapm.bias_level; 595 card->rtd[i].codec->dapm.suspend_bias_level = card->rtd[i].codec->dapm.bias_level;
596 } 596 }
597 597
@@ -1846,7 +1846,7 @@ static int soc_cleanup_card_resources(struct snd_soc_card *card)
1846 /* make sure any delayed work runs */ 1846 /* make sure any delayed work runs */
1847 for (i = 0; i < card->num_rtd; i++) { 1847 for (i = 0; i < card->num_rtd; i++) {
1848 struct snd_soc_pcm_runtime *rtd = &card->rtd[i]; 1848 struct snd_soc_pcm_runtime *rtd = &card->rtd[i];
1849 flush_delayed_work_sync(&rtd->delayed_work); 1849 flush_delayed_work(&rtd->delayed_work);
1850 } 1850 }
1851 1851
1852 /* remove auxiliary devices */ 1852 /* remove auxiliary devices */
@@ -1890,7 +1890,7 @@ int snd_soc_poweroff(struct device *dev)
1890 * now, we're shutting down so no imminent restart. */ 1890 * now, we're shutting down so no imminent restart. */
1891 for (i = 0; i < card->num_rtd; i++) { 1891 for (i = 0; i < card->num_rtd; i++) {
1892 struct snd_soc_pcm_runtime *rtd = &card->rtd[i]; 1892 struct snd_soc_pcm_runtime *rtd = &card->rtd[i];
1893 flush_delayed_work_sync(&rtd->delayed_work); 1893 flush_delayed_work(&rtd->delayed_work);
1894 } 1894 }
1895 1895
1896 snd_soc_dapm_shutdown(card); 1896 snd_soc_dapm_shutdown(card);