This is a note to let you know that I've just added the patch titled ALSA: hda: Don't release card at firmware loading error to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: alsa-hda-don-t-release-card-at-firmware-loading-error.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 25faa4bd37c10f19e4b848b9032a17a3d44c6f09 Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai@xxxxxxx> Date: Mon, 13 Apr 2020 10:20:29 +0200 Subject: ALSA: hda: Don't release card at firmware loading error From: Takashi Iwai <tiwai@xxxxxxx> commit 25faa4bd37c10f19e4b848b9032a17a3d44c6f09 upstream. 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: 5cb543dba986 ("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@xxxxxxx Signed-off-by: Takashi Iwai <tiwai@xxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- sound/pci/hda/hda_intel.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1828,24 +1828,15 @@ static void azx_firmware_cb(const struct { 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; - } - - chip->fw = fw; + 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 Patches currently in stable-queue which might be from tiwai@xxxxxxx are queue-4.9/alsa-hda-don-t-release-card-at-firmware-loading-error.patch queue-4.9/alsa-usb-audio-add-mixer-workaround-for-trx40-and-co.patch queue-4.9/alsa-pcm-oss-fix-regression-by-buffer-overflow-fix.patch queue-4.9/alsa-ice1724-fix-invalid-access-for-enumerated-ctl-items.patch queue-4.9/alsa-hda-fix-potential-access-overflow-in-beep-helper.patch queue-4.9/alsa-usb-audio-don-t-override-ignore_ctl_error-value-from-the-map.patch queue-4.9/alsa-hda-initialize-power_state-field-properly.patch queue-4.9/alsa-hda-add-driver-blacklist.patch