Commit 25faa4bd authored Apr 13, 2020 by Takashi Iwai

ALSA: hda: Don't release card at firmware loading error

At the error path of the firmware loading error, the driver tries to
release the card object and set NULL to drvdata. This may be referred
badly at the possible PM action, as the driver itself is still bound
and the PM callbacks read the card object.

Instead, we continue the probing as if it were no option set. This is
often a better choice than the forced abort, too.

Fixes: 5cb543db ("ALSA: hda - Deferred probing with request_firmware_nowait()")
BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=207043
Link: https://lore.kernel.org/r/20200413082034.25166-2-tiwai@suse.de

Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent 934b9659

sound/pci/hda/hda_intel.c

+5 −14

Original line number	Diff line number	Diff line
		@@ -2027,24 +2027,15 @@ static void azx_firmware_cb(const struct firmware fw, void context)
		{
		struct snd_card *card = context;
		struct azx *chip = card->private_data;
		struct pci_dev *pci = chip->pci;

		if (!fw) {
		dev_err(card->dev, "Cannot load firmware, aborting\n");
		goto error;
		}

		if (fw)
		chip->fw = fw;
		else
		dev_err(card->dev, "Cannot load firmware, continue without patching\n");
		if (!chip->disabled) {
		/* continue probing */
		if (azx_probe_continue(chip))
		goto error;
		azx_probe_continue(chip);
		}
		return; /* OK */

		error:
		snd_card_free(card);
		pci_set_drvdata(pci, NULL);
		}
		#endif

Admin message