From 6a428ff332e490b076df49bbad2973e5b65d15c7 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 30 Jul 2010 11:28:02 +0200
Subject: [PATCH] --- yaml --- r: 206481 b: refs/heads/master c:
 697c373e34613609cb5450f98b91fefb6e910588 h: refs/heads/master i:   206479:
 567d6c0a97c00251614f06205a19b57a6e4aff58 v: v3

---
 [refs]                               |  2 +-
 trunk/sound/pci/hda/patch_conexant.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b1dc8cad6f3f..5b4a7b84462f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 954a29c881bd0c61352af0946f2c39d738d43c1b
+refs/heads/master: 697c373e34613609cb5450f98b91fefb6e910588
diff --git a/trunk/sound/pci/hda/patch_conexant.c b/trunk/sound/pci/hda/patch_conexant.c
index c99425ab2e70..d6341f3fef01 100644
--- a/trunk/sound/pci/hda/patch_conexant.c
+++ b/trunk/sound/pci/hda/patch_conexant.c
@@ -611,11 +611,23 @@ static int conexant_build_controls(struct hda_codec *codec)
 	return 0;
 }
 
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static int conexant_suspend(struct hda_codec *codec, pm_message_t state)
+{
+	snd_hda_shutup_pins(codec);
+	return 0;
+}
+#endif
+
 static struct hda_codec_ops conexant_patch_ops = {
 	.build_controls = conexant_build_controls,
 	.build_pcms = conexant_build_pcms,
 	.init = conexant_init,
 	.free = conexant_free,
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+	.suspend = conexant_suspend,
+#endif
+	.reboot_notify = snd_hda_shutup_pins,
 };
 
 #ifdef CONFIG_SND_HDA_INPUT_BEEP