ALSA: hda: Add missing sanity checks in PM prepare/complete callbacks
authorTakashi Iwai <tiwai@suse.de>
Mon, 29 Mar 2021 11:30:59 +0000 (13:30 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 30 Mar 2021 11:16:42 +0000 (13:16 +0200)
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>
sound/pci/hda/hda_intel.c

index c4146e8617de03e240e702e58f084aa4e4a1f034..65551eea6752c8a58d49169ed840bd01da6e230d 100644 (file)
@@ -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;