2 files changed, 9 insertions, 10 deletions

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 27b0c78abb5b..056cd9ade1fb 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -91,8 +91,10 @@ EXPORT_SYMBOL_HDA(snd_hda_delete_codec_preset);
 #ifdef CONFIG_SND_HDA_POWER_SAVE
 static void hda_power_work(struct work_struct *work);
 static void hda_keep_power_on(struct hda_codec *codec);
+#define hda_codec_is_power_on(codec)    ((codec)->power_on)
 #else
 static inline void hda_keep_power_on(struct hda_codec *codec) {}
+#define hda_codec_is_power_on(codec)    1
 #endif
 
 /**
@@ -4376,11 +4378,8 @@ void snd_hda_bus_reboot_notify(struct hda_bus *bus)
         if (!bus)
                 return;
         list_for_each_entry(codec, &bus->codec_list, list) {
-#ifdef CONFIG_SND_HDA_POWER_SAVE
-                if (!codec->power_on)
-                        continue;
-#endif
-                if (codec->patch_ops.reboot_notify)
+                if (hda_codec_is_power_on(codec) &&
+                    codec->patch_ops.reboot_notify)
                         codec->patch_ops.reboot_notify(codec);
         }
 }
@@ -5079,11 +5078,10 @@ int snd_hda_suspend(struct hda_bus *bus)
         struct hda_codec *codec;
 
         list_for_each_entry(codec, &bus->codec_list, list) {
-#ifdef CONFIG_SND_HDA_POWER_SAVE
-                if (!codec->power_on)
-                        continue;
-#endif
-                hda_call_codec_suspend(codec);
+                if (hda_codec_is_power_on(codec))
+                        hda_call_codec_suspend(codec);
+                if (codec->patch_ops.post_suspend)
+                        codec->patch_ops.post_suspend(codec);
         }
         return 0;
 }
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 663aa4fc384a..c7ca753d94ee 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -702,6 +702,7 @@ struct hda_codec_ops {
         void (*unsol_event)(struct hda_codec *codec, unsigned int res);
 #ifdef CONFIG_PM
         int (*suspend)(struct hda_codec *codec, pm_message_t state);
+        int (*post_suspend)(struct hda_codec *codec);
         int (*pre_resume)(struct hda_codec *codec);
         int (*resume)(struct hda_codec *codec);
 #endif