aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_intel.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 8aee322313ed..f2337e4eddda 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1900,6 +1900,12 @@ static void azx_power_notify(struct hda_bus *bus)
1900 else if (chip->running && power_save_controller) 1900 else if (chip->running && power_save_controller)
1901 azx_stop_chip(chip); 1901 azx_stop_chip(chip);
1902} 1902}
1903#endif /* CONFIG_SND_HDA_POWER_SAVE */
1904
1905#ifdef CONFIG_PM
1906/*
1907 * power management
1908 */
1903 1909
1904static int snd_hda_codecs_inuse(struct hda_bus *bus) 1910static int snd_hda_codecs_inuse(struct hda_bus *bus)
1905{ 1911{
@@ -1911,14 +1917,7 @@ static int snd_hda_codecs_inuse(struct hda_bus *bus)
1911 } 1917 }
1912 return 0; 1918 return 0;
1913} 1919}
1914#else /* !CONFIG_SND_HDA_POWER_SAVE */
1915#define snd_hda_codecs_inuse(bus) 1
1916#endif /* CONFIG_SND_HDA_POWER_SAVE */
1917 1920
1918#ifdef CONFIG_PM
1919/*
1920 * power management
1921 */
1922static int azx_suspend(struct pci_dev *pci, pm_message_t state) 1921static int azx_suspend(struct pci_dev *pci, pm_message_t state)
1923{ 1922{
1924 struct snd_card *card = pci_get_drvdata(pci); 1923 struct snd_card *card = pci_get_drvdata(pci);