diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2021-03-29 13:30:59 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-03-30 13:16:42 +0200 |
| commit | 66affb7bb0dc0905155a1b2475261aa704d1ddb5 (patch) | |
| tree | 862eb907011a4713bb40d130a156d33fd0db8196 /sound/pci/hda/hda_intel.c | |
| parent | ALSA: hda: Re-add dropped snd_poewr_change_state() calls (diff) | |
| download | linux-dev-66affb7bb0dc0905155a1b2475261aa704d1ddb5.tar.xz linux-dev-66affb7bb0dc0905155a1b2475261aa704d1ddb5.zip | |
ALSA: hda: Add missing sanity checks in PM prepare/complete callbacks
The recently added PM prepare and complete callbacks don't have the
sanity check whether the card instance has been properly initialized,
which may potentially lead to Oops.
This patch adds the azx_is_pm_ready() call in each place
appropriately like other PM callbacks.
Fixes: f5dac54d9d93 ("ALSA: hda: Separate runtime and system suspend")
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20210329113059.25035-2-tiwai@suse.de
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 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index c4146e8617de..65551eea6752 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1023,6 +1023,9 @@ 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); @@ -1040,6 +1043,9 @@ 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; |