View | Details | Raw Unified | Return to bug 199073 | Differences between
and this patch

Collapse All | Expand All

(-)a/sound/pci/hda/hda_intel.c (-3 / +6 lines)
Lines 181-191 static const struct kernel_param_ops param_ops_xint = { Link Here
181
};
181
};
182
#define param_check_xint param_check_int
182
#define param_check_xint param_check_int
183
183
184
static int power_save = -1;
184
static int power_save = CONFIG_SND_HDA_POWER_SAVE_DEFAULT;
185
module_param(power_save, xint, 0644);
185
module_param(power_save, xint, 0644);
186
MODULE_PARM_DESC(power_save, "Automatic power-saving timeout "
186
MODULE_PARM_DESC(power_save, "Automatic power-saving timeout "
187
		 "(in second, 0 = disable).");
187
		 "(in second, 0 = disable).");
188
188
189
static bool pm_blacklist = true;
190
module_param(pm_blacklist, bool, 0644);
191
MODULE_PARM_DESC(pm_blacklist, "Enable power-management blacklist");
192
189
/* reset the HD-audio controller in power save mode.
193
/* reset the HD-audio controller in power save mode.
190
 * this may give more power-saving, but will take longer time to
194
 * this may give more power-saving, but will take longer time to
191
 * wake up.
195
 * wake up.
Lines 2300-2309 static int azx_probe_continue(struct azx *chip) Link Here
2300
2304
2301
	val = power_save;
2305
	val = power_save;
2302
#ifdef CONFIG_PM
2306
#ifdef CONFIG_PM
2303
	if (val == -1) {
2307
	if (pm_blacklist) {
2304
		const struct snd_pci_quirk *q;
2308
		const struct snd_pci_quirk *q;
2305
2309
2306
		val = CONFIG_SND_HDA_POWER_SAVE_DEFAULT;
2307
		q = snd_pci_quirk_lookup(chip->pci, power_save_blacklist);
2310
		q = snd_pci_quirk_lookup(chip->pci, power_save_blacklist);
2308
		if (q && val) {
2311
		if (q && val) {
2309
			dev_info(chip->card->dev, "device %04x:%04x is on the power_save blacklist, forcing power_save to 0\n",
2312
			dev_info(chip->card->dev, "device %04x:%04x is on the power_save blacklist, forcing power_save to 0\n",

Return to bug 199073