ALSA: bt87x: Fix the missing snd_card_free() call at probe error
commitf043815527
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:9e80ed64a0
("ALSA: bt87x: Allocate resources with device-managed APIs") Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20220412102636.16000-29-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:
Родитель
935629ba09
Коммит
e5a54e236f
|
@ -805,8 +805,8 @@ static int snd_bt87x_detect_card(struct pci_dev *pci)
|
|||
return SND_BT87X_BOARD_UNKNOWN;
|
||||
}
|
||||
|
||||
static int snd_bt87x_probe(struct pci_dev *pci,
|
||||
const struct pci_device_id *pci_id)
|
||||
static int __snd_bt87x_probe(struct pci_dev *pci,
|
||||
const struct pci_device_id *pci_id)
|
||||
{
|
||||
static int dev;
|
||||
struct snd_card *card;
|
||||
|
@ -889,6 +889,12 @@ static int snd_bt87x_probe(struct pci_dev *pci,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int snd_bt87x_probe(struct pci_dev *pci,
|
||||
const struct pci_device_id *pci_id)
|
||||
{
|
||||
return snd_card_free_on_error(&pci->dev, __snd_bt87x_probe(pci, pci_id));
|
||||
}
|
||||
|
||||
/* default entries for all Bt87x cards - it's not exported */
|
||||
/* driver_data is set to 0 to call detection */
|
||||
static const struct pci_device_id snd_bt87x_default_ids[] = {
|
||||
|
|
Загрузка…
Ссылка в новой задаче