ALSA: ali5451: Fix the missing snd_card_free() call at probe error
commit19401a9441
upstream. The recent 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:1f08199792
("ALSA: ali5451: Allocate resources with device-managed APIs") Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20220412102636.16000-5-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:
Родитель
cfa98d6c41
Коммит
5bc1564090
|
@ -2124,8 +2124,8 @@ static int snd_ali_create(struct snd_card *card,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int snd_ali_probe(struct pci_dev *pci,
|
||||
const struct pci_device_id *pci_id)
|
||||
static int __snd_ali_probe(struct pci_dev *pci,
|
||||
const struct pci_device_id *pci_id)
|
||||
{
|
||||
struct snd_card *card;
|
||||
struct snd_ali *codec;
|
||||
|
@ -2170,6 +2170,12 @@ static int snd_ali_probe(struct pci_dev *pci,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int snd_ali_probe(struct pci_dev *pci,
|
||||
const struct pci_device_id *pci_id)
|
||||
{
|
||||
return snd_card_free_on_error(&pci->dev, __snd_ali_probe(pci, pci_id));
|
||||
}
|
||||
|
||||
static struct pci_driver ali5451_driver = {
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_ali_ids,
|
||||
|
|
Загрузка…
Ссылка в новой задаче