Merge branch 'for-linus' into test

[sfrench/cifs-2.6.git] / sound / soc / soc-pcm.c

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 8075856668c23b10e0f16eebb78cb59b8c7a233a..084125463d101e96ab0aa119a964ac5609e6ab06 100644 (file)
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -144,7 +144,7 @@ bool snd_soc_runtime_ignore_pmdown_time(struct snd_soc_pcm_runtime *rtd)
        for_each_rtdcom(rtd, rtdcom) {
                component = rtdcom->component;
 
-               ignore &= !component->driver->pmdown_time;
+               ignore &= !component->driver->use_pmdown_time;
        }
 
        /* this will be removed */
@@ -2831,10 +2831,9 @@ static void soc_pcm_private_free(struct snd_pcm *pcm)
        struct snd_soc_rtdcom_list *rtdcom;
        struct snd_soc_component *component;
 
+       /* need to sync the delayed work before releasing resources */
+       flush_delayed_work(&rtd->delayed_work);
        for_each_rtdcom(rtd, rtdcom) {
-               /* need to sync the delayed work before releasing resources */
-
-               flush_delayed_work(&rtd->delayed_work);
                component = rtdcom->component;
 
                if (component->pcm_free)