aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorAlexander Beregalov <a.beregalov@gmail.com>2009-06-04 13:46:16 +0400
committerTakashi Iwai <tiwai@suse.de>2009-06-04 14:21:11 +0200
commit65f759831179bb8922f2a91a989487161d476a94 (patch)
tree2e7569128a14f197642bea347a7aec2a9f95c385 /sound
parentALSA: hda - More Aspire 8930G fixes (diff)
downloadlinux-dev-65f759831179bb8922f2a91a989487161d476a94.tar.xz
linux-dev-65f759831179bb8922f2a91a989487161d476a94.zip
ALSA: hda_intel: fix build error when !PM
Fix this build error when CONFIG_PM is not set: ound/pci/hda/hda_intel.c: In function 'azx_bus_reset': sound/pci/hda/hda_intel.c:1270: error: implicit declaration of function 'snd_pcm_suspend_all' sound/pci/hda/hda_intel.c:1271: error: implicit declaration of function 'snd_hda_suspend' sound/pci/hda/hda_intel.c:1272: error: implicit declaration of function 'snd_hda_resume' Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_intel.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 9f44645a1d04..4e9ea7080270 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/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;
}