mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-07 03:15:31 +09:00
ALSA: hdspm: Fix the missing snd_card_free() call at probe error
commiteab521aebcupstream. 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:0195ca5fd1("ALSA: hdspm: Allocate resources with device-managed APIs") Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20220412102636.16000-37-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:
committed by
Greg Kroah-Hartman
parent
f006a4bcf8
commit
141abcbf90
@@ -6895,7 +6895,7 @@ static int snd_hdspm_probe(struct pci_dev *pci,
|
||||
|
||||
err = snd_hdspm_create(card, hdspm);
|
||||
if (err < 0)
|
||||
return err;
|
||||
goto error;
|
||||
|
||||
if (hdspm->io_type != MADIface) {
|
||||
snprintf(card->shortname, sizeof(card->shortname), "%s_%x",
|
||||
@@ -6914,12 +6914,16 @@ static int snd_hdspm_probe(struct pci_dev *pci,
|
||||
|
||||
err = snd_card_register(card);
|
||||
if (err < 0)
|
||||
return err;
|
||||
goto error;
|
||||
|
||||
pci_set_drvdata(pci, card);
|
||||
|
||||
dev++;
|
||||
return 0;
|
||||
|
||||
error:
|
||||
snd_card_free(card);
|
||||
return err;
|
||||
}
|
||||
|
||||
static struct pci_driver hdspm_driver = {
|
||||
|
||||
Reference in New Issue
Block a user