diff options
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/codecs/wm8350.c | 2 | ||||
-rw-r--r-- | sound/soc/codecs/wm8753.c | 2 | ||||
-rw-r--r-- | sound/soc/soc-core.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index d26c8ae4e6d9..a4cae060bf26 100644 --- a/sound/soc/codecs/wm8350.c +++ b/sound/soc/codecs/wm8350.c | |||
@@ -1601,7 +1601,7 @@ static int wm8350_codec_remove(struct snd_soc_codec *codec) | |||
1601 | 1601 | ||
1602 | /* if there was any work waiting then we run it now and | 1602 | /* if there was any work waiting then we run it now and |
1603 | * wait for its completion */ | 1603 | * wait for its completion */ |
1604 | flush_delayed_work_sync(&codec->dapm.delayed_work); | 1604 | flush_delayed_work(&codec->dapm.delayed_work); |
1605 | 1605 | ||
1606 | wm8350_set_bias_level(codec, SND_SOC_BIAS_OFF); | 1606 | wm8350_set_bias_level(codec, SND_SOC_BIAS_OFF); |
1607 | 1607 | ||
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index 13bff87ddcf5..2e4a775ae560 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c | |||
@@ -1509,7 +1509,7 @@ static int wm8753_probe(struct snd_soc_codec *codec) | |||
1509 | /* power down chip */ | 1509 | /* power down chip */ |
1510 | static int wm8753_remove(struct snd_soc_codec *codec) | 1510 | static int wm8753_remove(struct snd_soc_codec *codec) |
1511 | { | 1511 | { |
1512 | flush_delayed_work_sync(&codec->dapm.delayed_work); | 1512 | flush_delayed_work(&codec->dapm.delayed_work); |
1513 | wm8753_set_bias_level(codec, SND_SOC_BIAS_OFF); | 1513 | wm8753_set_bias_level(codec, SND_SOC_BIAS_OFF); |
1514 | 1514 | ||
1515 | return 0; | 1515 | return 0; |
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); |