--- sound/soc/soc-core.c	2009-12-22 15:00:18.000000000 +0100
+++ sound/soc/soc-core.c	2009-12-22 15:14:19.000000000 +0100
@@ -73,7 +73,7 @@
 
 	/* if there was any work waiting then we run it now and
 	 * wait for it's completion */
-	if (ret) {
+	if (1) {
 		schedule_delayed_work(dwork, 0);
 		flush_scheduled_work();
 	}
@@ -374,8 +374,6 @@
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
 		/* start delayed pop wq here for playback streams */
 		codec_dai->pop_wait = 1;
-		schedule_delayed_work(&card->delayed_work,
-			msecs_to_jiffies(pmdown_time));
 	} else {
 		/* capture streams can be powered down now */
 		snd_soc_dapm_stream_event(codec,