3 files changed, 17 insertions, 2 deletions

diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 5d0732c09f2e..2c6486c23a52 100644
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -589,6 +589,14 @@ config SND_HDA_POWER_SAVE
           HD-audio driver.  The power-saving timeout can be configured
           via power_save option or over sysfs on-the-fly.
 
+config SND_HDA_POWER_SAVE_DEFAULT
+        int "Default time-out for HD-audio power-save mode"
+        depends on SND_HDA_POWER_SAVE
+        default 0
+        help
+          The default time-out value in seconds for HD-audio automatic
+          power-save mode.  0 means to disable the power-save mode.
+
 config SND_HDSP
         tristate "RME Hammerfall DSP Audio"
         depends on SND
@@ -888,4 +896,11 @@ config SND_AC97_POWER_SAVE
           snd-ac97-codec driver.  You can toggle it dynamically over
           sysfs, too.
 
+config SND_AC97_POWER_SAVE_DEFAULT
+        int "Default time-out for AC97 power-save mode"
+        depends on SND_AC97_POWER_SAVE
+        default 0
+          The default time-out value in seconds for AC97 automatic
+          power-save mode.  0 means to disable the power-save mode.
+
 endmenu
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index 3e5ff29fc499..0906f1717f2b 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -49,7 +49,7 @@ module_param(enable_loopback, bool, 0444);
 MODULE_PARM_DESC(enable_loopback, "Enable AC97 ADC/DAC Loopback Control");
 
 #ifdef CONFIG_SND_AC97_POWER_SAVE
-static int power_save;
+static int power_save = CONFIG_SND_AC97_POWER_SAVE_DEFAULT;
 module_param(power_save, bool, 0644);
 MODULE_PARM_DESC(power_save, "Enable AC97 power-saving control");
 #endif
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 535bcb7601b5..18ef0aa69d98 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -35,7 +35,7 @@
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
 /* define this option here to hide as static */
-static int power_save = 10;
+static int power_save = CONFIG_SND_HDA_POWER_SAVE_DEFAULT;
 module_param(power_save, int, 0644);
 MODULE_PARM_DESC(power_save, "Automatic power-saving timeout "
                  "(in second, 0 = disable).");