---

yaml --- r: 120529 b: refs/heads/master c: 5c0b9be h: refs/heads/master i: 120527: 1ed1a43 v: v3
git-mirror · Dec 11, 2008 · 9a5e320 · 9a5e320
1 parent 8f2f174
commit 9a5e320
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11d518e07d700eeb5bcec36bfd5f501e405230dd
+refs/heads/master: 5c0b9bec460c348d2ee5a800c288e5d0e8fcda66
diff --git a/trunk/sound/pci/hda/hda_intel.c b/trunk/sound/pci/hda/hda_intel.c
@@ -1900,6 +1900,12 @@ static void azx_power_notify(struct hda_bus *bus)
 	else if (chip->running && power_save_controller)
 		azx_stop_chip(chip);
 }
+#endif /* CONFIG_SND_HDA_POWER_SAVE */
+
+#ifdef CONFIG_PM
+/*
+ * power management
+ */
 
 static int snd_hda_codecs_inuse(struct hda_bus *bus)
 {
@@ -1911,14 +1917,7 @@ static int snd_hda_codecs_inuse(struct hda_bus *bus)
 	}
 	return 0;
 }
-#else /* !CONFIG_SND_HDA_POWER_SAVE */
-#define snd_hda_codecs_inuse(bus) 1
-#endif /* CONFIG_SND_HDA_POWER_SAVE */
 
-#ifdef CONFIG_PM
-/*
- * power management
- */
 static int azx_suspend(struct pci_dev *pci, pm_message_t state)
 {
 	struct snd_card *card = pci_get_drvdata(pci);