Merge branch 'pandora-27-omap1' into rev2

[pandora-kernel.git] / sound / soc / soc-core.c

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 83f1190..cbe21fd 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -52,8 +52,8 @@ static DECLARE_WAIT_QUEUE_HEAD(soc_pm_waitq);
  * It can be used to eliminate pops between different playback streams, e.g.
  * between two audio tracks.
  */
-static int pmdown_time = 5000;
-module_param(pmdown_time, int, 0);
+static int pmdown_time = 60000;
+module_param(pmdown_time, int, 0644);
 MODULE_PARM_DESC(pmdown_time, "DAPM stream powerdown time (msecs)");
 
 /*