Commit b087a381 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: sonicvibes: Fix the missing snd_card_free() call at probe error 

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: 2ca6cbde ("ALSA: sonicvibes: Allocate resources with device-managed APIs")
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20220412102636.16000-25-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 93b884f8

sound/pci/sonicvibes.c

+8 −2
Original line number Diff line number Diff line
@@ -1387,7 +1387,7 @@ static int snd_sonicvibes_midi(struct sonicvibes *sonic, 
	return 0;

}



static int snd_sonic_probe(struct pci_dev *pci,

static int __snd_sonic_probe(struct pci_dev *pci,

			     const struct pci_device_id *pci_id)

{

	static int dev;
@@ -1459,6 +1459,12 @@ static int snd_sonic_probe(struct pci_dev *pci, 
	return 0;

}



static int snd_sonic_probe(struct pci_dev *pci,

			   const struct pci_device_id *pci_id)

{

	return snd_card_free_on_error(&pci->dev, __snd_sonic_probe(pci, pci_id));

}



static struct pci_driver sonicvibes_driver = {

	.name = KBUILD_MODNAME,

	.id_table = snd_sonic_ids,