ALSA: rme96: Fix the missing snd_card_free() call at probe error
commit93b884f8d8
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:df06df7cc9
("ALSA: rme96: Allocate resources with device-managed APIs") Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20220412102636.16000-24-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:
Родитель
ef4c353394
Коммит
df03ce487e
|
@ -2430,8 +2430,8 @@ static void snd_rme96_card_free(struct snd_card *card)
|
|||
}
|
||||
|
||||
static int
|
||||
snd_rme96_probe(struct pci_dev *pci,
|
||||
const struct pci_device_id *pci_id)
|
||||
__snd_rme96_probe(struct pci_dev *pci,
|
||||
const struct pci_device_id *pci_id)
|
||||
{
|
||||
static int dev;
|
||||
struct rme96 *rme96;
|
||||
|
@ -2498,6 +2498,12 @@ snd_rme96_probe(struct pci_dev *pci,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int snd_rme96_probe(struct pci_dev *pci,
|
||||
const struct pci_device_id *pci_id)
|
||||
{
|
||||
return snd_card_free_on_error(&pci->dev, __snd_rme96_probe(pci, pci_id));
|
||||
}
|
||||
|
||||
static struct pci_driver rme96_driver = {
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = snd_rme96_ids,
|
||||
|
|
Загрузка…
Ссылка в новой задаче