ALSA: lx6464es: Fix the missing snd_card_free() call at probe error
commit60797a21dd
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:6f16c19b11
("ALSA: lx6464es: Allocate resources with device-managed APIs") Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20220412102636.16000-34-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:
Родитель
0651442d22
Коммит
5fbb73cb12
|
@ -1019,7 +1019,7 @@ static int snd_lx6464es_probe(struct pci_dev *pci,
|
|||
err = snd_lx6464es_create(card, pci);
|
||||
if (err < 0) {
|
||||
dev_err(card->dev, "error during snd_lx6464es_create\n");
|
||||
return err;
|
||||
goto error;
|
||||
}
|
||||
|
||||
strcpy(card->driver, "LX6464ES");
|
||||
|
@ -1036,12 +1036,16 @@ static int snd_lx6464es_probe(struct pci_dev *pci,
|
|||
|
||||
err = snd_card_register(card);
|
||||
if (err < 0)
|
||||
return err;
|
||||
goto error;
|
||||
|
||||
dev_dbg(chip->card->dev, "initialization successful\n");
|
||||
pci_set_drvdata(pci, card);
|
||||
dev++;
|
||||
return 0;
|
||||
|
||||
error:
|
||||
snd_card_free(card);
|
||||
return err;
|
||||
}
|
||||
|
||||
static struct pci_driver lx6464es_driver = {
|
||||
|
|
Загрузка…
Ссылка в новой задаче