ALSA: ice1724: Fix the missing snd_card_free() call at probe error
commit4a850a0079
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:314f6dbb1f
("ALSA: ice1724: Allocate resources with device-managed APIs") Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20220412102636.16000-18-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:
Родитель
141abcbf90
Коммит
547c9af67b
|
@ -2519,8 +2519,8 @@ static int snd_vt1724_create(struct snd_card *card,
|
|||
*
|
||||
*/
|
||||
|
||||
static int snd_vt1724_probe(struct pci_dev *pci,
|
||||
const struct pci_device_id *pci_id)
|
||||
static int __snd_vt1724_probe(struct pci_dev *pci,
|
||||
const struct pci_device_id *pci_id)
|
||||
{
|
||||
static int dev;
|
||||
struct snd_card *card;
|
||||
|
@ -2662,6 +2662,12 @@ static int snd_vt1724_probe(struct pci_dev *pci,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int snd_vt1724_probe(struct pci_dev *pci,
|
||||
const struct pci_device_id *pci_id)
|
||||
{
|
||||
return snd_card_free_on_error(&pci->dev, __snd_vt1724_probe(pci, pci_id));
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
static int snd_vt1724_suspend(struct device *dev)
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче