diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2021-04-09 09:56:58 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-04-09 09:57:03 +0200 |
| commit | 473d5ae82d73c3b21160b725af0e247fa94d7832 (patch) | |
| tree | d70bec96f7539abab14ea5566a74c6c255aab1d2 /sound/pci/hda/hda_intel.c | |
| parent | ALSA: control: Add memory consumption limit to user controls (diff) | |
| parent | ALSA: hda/realtek: Fix speaker amp setup on Acer Aspire E1 (diff) | |
| download | linux-dev-473d5ae82d73c3b21160b725af0e247fa94d7832.tar.xz linux-dev-473d5ae82d73c3b21160b725af0e247fa94d7832.zip | |
Merge branch 'for-linus' into for-next
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index b59b0f323d4e..79ade335c8a0 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -989,8 +989,12 @@ static int azx_prepare(struct device *dev) struct snd_card *card = dev_get_drvdata(dev); struct azx *chip; + if (!azx_is_pm_ready(card)) + return 0; + chip = card->private_data; chip->pm_prepared = 1; + snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); flush_work(&azx_bus(chip)->unsol_work); @@ -1005,7 +1009,11 @@ static void azx_complete(struct device *dev) struct snd_card *card = dev_get_drvdata(dev); struct azx *chip; + if (!azx_is_pm_ready(card)) + return; + chip = card->private_data; + snd_power_change_state(card, SNDRV_CTL_POWER_D0); chip->pm_prepared = 0; } |