3 files changed, 8 insertions, 17 deletions

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 98976c8ed107..e134e7212cd9 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -3500,6 +3500,10 @@ static void hda_call_codec_suspend(struct hda_codec *codec)
  */
 static void hda_call_codec_resume(struct hda_codec *codec)
 {
+        /* set as if powered on for avoiding re-entering the resume
+         * in the resume / power-save sequence
+         */
+        hda_keep_power_on(codec);
         hda_set_power_state(codec,
                             codec->afg ? codec->afg : codec->mfg,
                             AC_PWRST_D0);
@@ -3515,6 +3519,7 @@ static void hda_call_codec_resume(struct hda_codec *codec)
                 snd_hda_codec_resume_amp(codec);
                 snd_hda_codec_resume_cache(codec);
         }
+        snd_hda_power_down(codec); /* flag down before returning */
 }
 #endif /* CONFIG_PM */
 
@@ -4332,6 +4337,7 @@ void snd_hda_power_up(struct hda_codec *codec)
         snd_hda_update_power_acct(codec);
         codec->power_on = 1;
         codec->power_jiffies = jiffies;
+        codec->power_transition = 1; /* avoid reentrance */
         if (bus->ops.pm_notify)
                 bus->ops.pm_notify(bus);
         hda_call_codec_resume(codec);
@@ -5521,8 +5527,7 @@ int snd_hda_resume(struct hda_bus *bus)
         list_for_each_entry(codec, &bus->codec_list, list) {
                 if (codec->patch_ops.pre_resume)
                         codec->patch_ops.pre_resume(codec);
-                if (snd_hda_codec_needs_resume(codec))
-                        hda_call_codec_resume(codec);
+                hda_call_codec_resume(codec);
         }
         return 0;
 }
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 56b4f74c0b13..0fe64912cefc 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -1051,12 +1051,10 @@ const char *snd_hda_get_jack_location(u32 cfg);
 #ifdef CONFIG_SND_HDA_POWER_SAVE
 void snd_hda_power_up(struct hda_codec *codec);
 void snd_hda_power_down(struct hda_codec *codec);
-#define snd_hda_codec_needs_resume(codec) codec->power_count
 void snd_hda_update_power_acct(struct hda_codec *codec);
 #else
 static inline void snd_hda_power_up(struct hda_codec *codec) {}
 static inline void snd_hda_power_down(struct hda_codec *codec) {}
-#define snd_hda_codec_needs_resume(codec) 1
 #endif
 
 #ifdef CONFIG_SND_HDA_PATCH_LOADER
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 6e958bf94191..c19e71a94e1b 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2351,17 +2351,6 @@ static void azx_power_notify(struct hda_bus *bus)
  * power management
  */
 
-static int snd_hda_codecs_inuse(struct hda_bus *bus)
-{
-        struct hda_codec *codec;
-
-        list_for_each_entry(codec, &bus->codec_list, list) {
-                if (snd_hda_codec_needs_resume(codec))
-                        return 1;
-        }
-        return 0;
-}
-
 static int azx_suspend(struct pci_dev *pci, pm_message_t state)
 {
         struct snd_card *card = pci_get_drvdata(pci);
@@ -2408,8 +2397,7 @@ static int azx_resume(struct pci_dev *pci)
                 return -EIO;
         azx_init_pci(chip);
 
-        if (snd_hda_codecs_inuse(chip->bus))
-                azx_init_chip(chip, 1);
+        azx_init_chip(chip, 1);
 
         snd_hda_resume(chip->bus);
         snd_power_change_state(card, SNDRV_CTL_POWER_D0);