From c3410dba58678d05a36ff4675a8cc3adb5ae29cf Mon Sep 17 00:00:00 2001
From: Alexander Beregalov <a.beregalov@gmail.com>
Date: Thu, 4 Jun 2009 13:46:16 +0400
Subject: [PATCH] --- yaml --- r: 148448 b: refs/heads/master c:
 65f759831179bb8922f2a91a989487161d476a94 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/sound/pci/hda/hda_intel.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e90f12fbbf42..eb029c9dd1e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 018df41861475595a51d327b83fb5830462f7a53
+refs/heads/master: 65f759831179bb8922f2a91a989487161d476a94
diff --git a/trunk/sound/pci/hda/hda_intel.c b/trunk/sound/pci/hda/hda_intel.c
index 9f44645a1d04..4e9ea7080270 100644
--- a/trunk/sound/pci/hda/hda_intel.c
+++ b/trunk/sound/pci/hda/hda_intel.c
@@ -1260,17 +1260,20 @@ static void azx_stop_chip(struct azx *chip);
 static void azx_bus_reset(struct hda_bus *bus)
 {
 	struct azx *chip = bus->private_data;
-	int i;
 
 	bus->in_reset = 1;
 	azx_stop_chip(chip);
 	azx_init_chip(chip);
+#ifdef CONFIG_PM
 	if (chip->initialized) {
+		int i;
+
 		for (i = 0; i < AZX_MAX_PCMS; i++)
 			snd_pcm_suspend_all(chip->pcm[i]);
 		snd_hda_suspend(chip->bus);
 		snd_hda_resume(chip->bus);
 	}
+#endif
 	bus->in_reset = 0;
 }