ALSA: intel8x0: Fix the missing snd_card_free() call at probe error
commit71b21f5f89
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:7835e0901e
("ALSA: intel8x0: Allocate resources with device-managed APIs") Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20220412102636.16000-19-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:
Родитель
547c9af67b
Коммит
e87b8d0ba4
|
@ -3109,7 +3109,7 @@ static int check_default_spdif_aclink(struct pci_dev *pci)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int snd_intel8x0_probe(struct pci_dev *pci,
|
static int __snd_intel8x0_probe(struct pci_dev *pci,
|
||||||
const struct pci_device_id *pci_id)
|
const struct pci_device_id *pci_id)
|
||||||
{
|
{
|
||||||
struct snd_card *card;
|
struct snd_card *card;
|
||||||
|
@ -3189,6 +3189,12 @@ static int snd_intel8x0_probe(struct pci_dev *pci,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int snd_intel8x0_probe(struct pci_dev *pci,
|
||||||
|
const struct pci_device_id *pci_id)
|
||||||
|
{
|
||||||
|
return snd_card_free_on_error(&pci->dev, __snd_intel8x0_probe(pci, pci_id));
|
||||||
|
}
|
||||||
|
|
||||||
static struct pci_driver intel8x0_driver = {
|
static struct pci_driver intel8x0_driver = {
|
||||||
.name = KBUILD_MODNAME,
|
.name = KBUILD_MODNAME,
|
||||||
.id_table = snd_intel8x0_ids,
|
.id_table = snd_intel8x0_ids,
|
||||||
|
|
|
@ -1178,7 +1178,7 @@ static struct shortname_table {
|
||||||
{ 0 },
|
{ 0 },
|
||||||
};
|
};
|
||||||
|
|
||||||
static int snd_intel8x0m_probe(struct pci_dev *pci,
|
static int __snd_intel8x0m_probe(struct pci_dev *pci,
|
||||||
const struct pci_device_id *pci_id)
|
const struct pci_device_id *pci_id)
|
||||||
{
|
{
|
||||||
struct snd_card *card;
|
struct snd_card *card;
|
||||||
|
@ -1225,6 +1225,12 @@ static int snd_intel8x0m_probe(struct pci_dev *pci,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int snd_intel8x0m_probe(struct pci_dev *pci,
|
||||||
|
const struct pci_device_id *pci_id)
|
||||||
|
{
|
||||||
|
return snd_card_free_on_error(&pci->dev, __snd_intel8x0m_probe(pci, pci_id));
|
||||||
|
}
|
||||||
|
|
||||||
static struct pci_driver intel8x0m_driver = {
|
static struct pci_driver intel8x0m_driver = {
|
||||||
.name = KBUILD_MODNAME,
|
.name = KBUILD_MODNAME,
|
||||||
.id_table = snd_intel8x0m_ids,
|
.id_table = snd_intel8x0m_ids,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче