diff options
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r-- | sound/soc/soc-core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index c501af6d8db..cf3d0b0c71b 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 | ||
@@ -1848,7 +1848,7 @@ static int soc_cleanup_card_resources(struct snd_soc_card *card) | |||
1848 | /* make sure any delayed work runs */ | 1848 | /* make sure any delayed work runs */ |
1849 | for (i = 0; i < card->num_rtd; i++) { | 1849 | for (i = 0; i < card->num_rtd; i++) { |
1850 | struct snd_soc_pcm_runtime *rtd = &card->rtd[i]; | 1850 | struct snd_soc_pcm_runtime *rtd = &card->rtd[i]; |
1851 | flush_delayed_work_sync(&rtd->delayed_work); | 1851 | flush_delayed_work(&rtd->delayed_work); |
1852 | } | 1852 | } |
1853 | 1853 | ||
1854 | /* remove auxiliary devices */ | 1854 | /* remove auxiliary devices */ |
@@ -1892,7 +1892,7 @@ int snd_soc_poweroff(struct device *dev) | |||
1892 | * now, we're shutting down so no imminent restart. */ | 1892 | * now, we're shutting down so no imminent restart. */ |
1893 | for (i = 0; i < card->num_rtd; i++) { | 1893 | for (i = 0; i < card->num_rtd; i++) { |
1894 | struct snd_soc_pcm_runtime *rtd = &card->rtd[i]; | 1894 | struct snd_soc_pcm_runtime *rtd = &card->rtd[i]; |
1895 | flush_delayed_work_sync(&rtd->delayed_work); | 1895 | flush_delayed_work(&rtd->delayed_work); |
1896 | } | 1896 | } |
1897 | 1897 | ||
1898 | snd_soc_dapm_shutdown(card); | 1898 | snd_soc_dapm_shutdown(card); |