aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_intel.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
-rw-r--r--sound/pci/hda/hda_intel.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index cca87277baf0..988323577834 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -134,8 +134,8 @@ MODULE_PARM_DESC(power_save, "Automatic power-saving timeout "
134 * this may give more power-saving, but will take longer time to 134 * this may give more power-saving, but will take longer time to
135 * wake up. 135 * wake up.
136 */ 136 */
137static bool power_save_controller = 1; 137static int power_save_controller = -1;
138module_param(power_save_controller, bool, 0644); 138module_param(power_save_controller, bint, 0644);
139MODULE_PARM_DESC(power_save_controller, "Reset controller in power save mode."); 139MODULE_PARM_DESC(power_save_controller, "Reset controller in power save mode.");
140#endif /* CONFIG_PM */ 140#endif /* CONFIG_PM */
141 141
@@ -2711,6 +2711,8 @@ static int azx_runtime_idle(struct device *dev)
2711 struct snd_card *card = dev_get_drvdata(dev); 2711 struct snd_card *card = dev_get_drvdata(dev);
2712 struct azx *chip = card->private_data; 2712 struct azx *chip = card->private_data;
2713 2713
2714 if (power_save_controller > 0)
2715 return 0;
2714 if (!power_save_controller || 2716 if (!power_save_controller ||
2715 !(chip->driver_caps & AZX_DCAPS_PM_RUNTIME)) 2717 !(chip->driver_caps & AZX_DCAPS_PM_RUNTIME))
2716 return -EBUSY; 2718 return -EBUSY;