2 files changed, 6 insertions, 1 deletions

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index fc1ddf408b9b..0e923f3f0a80 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -2771,6 +2771,10 @@ int snd_hda_suspend(struct hda_bus *bus, pm_message_t state)
         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);
         }
         return 0;
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index e20629a2d7d1..ab698336563c 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1550,7 +1550,8 @@ static int azx_suspend(struct pci_dev *pci, pm_message_t state)
         snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
         for (i = 0; i < chip->pcm_devs; i++)
                 snd_pcm_suspend_all(chip->pcm[i]);
-        snd_hda_suspend(chip->bus, state);
+        if (chip->initialized)
+                snd_hda_suspend(chip->bus, state);
         azx_stop_chip(chip);
         if (chip->irq >= 0) {
                 synchronize_irq(chip->irq);