From 8e23a630d1d302a749d75de89cbdd0ac39b1d3c6 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 28 Jun 2011 08:59:30 +0200
Subject: [PATCH] --- yaml --- r: 257718 b: refs/heads/master c:
 ff2b7e2a3fdb341a235e0b2eccc3c8914d26c1fb h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/sound/pci/hda/hda_codec.h | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 5fc7b77fed3b..6f6c75a9766d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 880a050f4ac4399c9da4aea3ca19a701f9a727e0
+refs/heads/master: ff2b7e2a3fdb341a235e0b2eccc3c8914d26c1fb
diff --git a/trunk/sound/pci/hda/hda_codec.h b/trunk/sound/pci/hda/hda_codec.h
index c71cd7fb6d11..79ef65e3ae14 100644
--- a/trunk/sound/pci/hda/hda_codec.h
+++ b/trunk/sound/pci/hda/hda_codec.h
@@ -1011,17 +1011,15 @@ int snd_hda_suspend(struct hda_bus *bus);
 int snd_hda_resume(struct hda_bus *bus);
 #endif
 
-#ifdef CONFIG_SND_HDA_POWER_SAVE
 static inline
 int hda_call_check_power_status(struct hda_codec *codec, hda_nid_t nid)
 {
+#ifdef CONFIG_SND_HDA_POWER_SAVE
 	if (codec->patch_ops.check_power_status)
 		return codec->patch_ops.check_power_status(codec, nid);
+#endif
 	return 0;
 }
-#else	
-#define hda_call_check_power_status(codec, nid)		0
-#endif
 
 /*
  * get widget information