From f74023ab8a86a5273dbe35b9a4425b6b0b81dcf5 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Sun, 8 Jun 2008 09:17:27 +0200 Subject: [PATCH] --- yaml --- r: 99088 b: refs/heads/master c: 38f582270feb19ea8821cb64c5d2fdbd6bdd0bd9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/pci/ac97/ac97_codec.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 758b2aa4c63d..f0c59f957bbe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05a076de83b507238cd186e93daeaf15820d570e +refs/heads/master: 38f582270feb19ea8821cb64c5d2fdbd6bdd0bd9 diff --git a/trunk/sound/pci/ac97/ac97_codec.c b/trunk/sound/pci/ac97/ac97_codec.c index 45fd29017ddd..2d2f16e11082 100644 --- a/trunk/sound/pci/ac97/ac97_codec.c +++ b/trunk/sound/pci/ac97/ac97_codec.c @@ -49,8 +49,9 @@ MODULE_PARM_DESC(enable_loopback, "Enable AC97 ADC/DAC Loopback Control"); #ifdef CONFIG_SND_AC97_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"); +module_param(power_save, int, 0644); +MODULE_PARM_DESC(power_save, "Automatic power-saving timeout " + "(in second, 0 = disable)."); #endif /* @@ -2362,7 +2363,7 @@ int snd_ac97_update_power(struct snd_ac97 *ac97, int reg, int powerup) * that open/close frequently) */ schedule_delayed_work(&ac97->power_work, - msecs_to_jiffies(2000)); + msecs_to_jiffies(power_save * 1000)); else { cancel_delayed_work(&ac97->power_work); update_power_regs(ac97);