ALSA: aw2: Fix the missing snd_card_free() call at probe error
commitbf4067e8a1
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() manually on the error from the probe callback. Fixes:33631012cd
("ALSA: aw2: Allocate resources with device-managed APIs") Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20220412102636.16000-32-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:
Родитель
811a92b866
Коммит
3a943321c3
|
@ -275,7 +275,7 @@ static int snd_aw2_probe(struct pci_dev *pci,
|
|||
/* (3) Create main component */
|
||||
err = snd_aw2_create(card, pci);
|
||||
if (err < 0)
|
||||
return err;
|
||||
goto error;
|
||||
|
||||
/* initialize mutex */
|
||||
mutex_init(&chip->mtx);
|
||||
|
@ -294,13 +294,17 @@ static int snd_aw2_probe(struct pci_dev *pci,
|
|||
/* (6) Register card instance */
|
||||
err = snd_card_register(card);
|
||||
if (err < 0)
|
||||
return err;
|
||||
goto error;
|
||||
|
||||
/* (7) Set PCI driver data */
|
||||
pci_set_drvdata(pci, card);
|
||||
|
||||
dev++;
|
||||
return 0;
|
||||
|
||||
error:
|
||||
snd_card_free(card);
|
||||
return err;
|
||||
}
|
||||
|
||||
/* open callback */
|
||||
|
|
Загрузка…
Ссылка в новой задаче