Commit 66affb7b authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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: f5dac54d ("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: default avatarTakashi Iwai <tiwai@suse.de>
parent c8f79808

sound/pci/hda/hda_intel.c

+6 −0
Original line number Diff line number Diff line
@@ -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;