ALSA: maestro3: Fix the missing snd_card_free() call at probe error
commitae86bf5c2a
upstream. The previous cleanup with devres may lead to the incorrect release orders at the probe error handling due to the devres's nature. Until we register the card, snd_card_free() has to be called at first for releasing the stuff properly when the driver tries to manage and release the stuff via card->private_free(). This patch fixes it by calling snd_card_free() on the error from the probe callback using a new helper function. Fixes:5c0939253c
("ALSA: maestro3: Allocate resources with device-managed APIs") Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20220412102636.16000-21-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
5fbb73cb12
Коммит
30b86477da
|
@ -2637,7 +2637,7 @@ snd_m3_create(struct snd_card *card, struct pci_dev *pci,
|
|||
/*
|
||||
*/
|
||||
static int
|
||||
snd_m3_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
|
||||
__snd_m3_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
|
||||
{
|
||||
static int dev;
|
||||
struct snd_card *card;
|
||||
|
@ -2702,6 +2702,12 @@ snd_m3_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
snd_m3_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
|
||||
{
|
||||
return snd_card_free_on_error(&pci->dev, __snd_m3_probe(pci, pci_id));
|
||||
}
|
||||
|
||||
static struct pci_driver m3_driver = {
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_m3_ids,
|
||||
|
|
Загрузка…
Ссылка в новой задаче