diff options
-rw-r--r-- | sound/pci/hda/hda_codec.c | 2 | ||||
-rw-r--r-- | sound/pci/hda/hda_intel.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 9a3b72824f87..efd56a3396bd 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c | |||
@@ -1662,6 +1662,7 @@ static void hda_call_codec_suspend(struct hda_codec *codec) | |||
1662 | AC_PWRST_D3); | 1662 | AC_PWRST_D3); |
1663 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 1663 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
1664 | cancel_delayed_work(&codec->power_work); | 1664 | cancel_delayed_work(&codec->power_work); |
1665 | codec->power_on = 0; | ||
1665 | #endif | 1666 | #endif |
1666 | } | 1667 | } |
1667 | 1668 | ||
@@ -2195,7 +2196,6 @@ static void hda_power_work(struct work_struct *work) | |||
2195 | return; | 2196 | return; |
2196 | 2197 | ||
2197 | hda_call_codec_suspend(codec); | 2198 | hda_call_codec_suspend(codec); |
2198 | codec->power_on = 0; | ||
2199 | if (codec->bus->ops.pm_notify) | 2199 | if (codec->bus->ops.pm_notify) |
2200 | codec->bus->ops.pm_notify(codec); | 2200 | codec->bus->ops.pm_notify(codec); |
2201 | } | 2201 | } |
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 7be3a9b55330..f9c7c2e4f922 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
@@ -1500,7 +1500,7 @@ static int azx_acquire_irq(struct azx *chip, int do_disconnect) | |||
1500 | 1500 | ||
1501 | static void azx_stop_chip(struct azx *chip) | 1501 | static void azx_stop_chip(struct azx *chip) |
1502 | { | 1502 | { |
1503 | if (chip->initialized) | 1503 | if (!chip->initialized) |
1504 | return; | 1504 | return; |
1505 | 1505 | ||
1506 | /* disable interrupts */ | 1506 | /* disable interrupts */ |