ALSA: sc6000: Fix the missing snd_card_free() call at probe error
commitd724580711
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:111601ff76
("ALSA: sc6000: Allocate resources with device-managed APIs") Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20220412102636.16000-3-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:
Родитель
df03ce487e
Коммит
73229d7cb8
|
@ -537,7 +537,7 @@ static void snd_sc6000_free(struct snd_card *card)
|
|||
sc6000_setup_board(vport, 0);
|
||||
}
|
||||
|
||||
static int snd_sc6000_probe(struct device *devptr, unsigned int dev)
|
||||
static int __snd_sc6000_probe(struct device *devptr, unsigned int dev)
|
||||
{
|
||||
static const int possible_irqs[] = { 5, 7, 9, 10, 11, -1 };
|
||||
static const int possible_dmas[] = { 1, 3, 0, -1 };
|
||||
|
@ -662,6 +662,11 @@ static int snd_sc6000_probe(struct device *devptr, unsigned int dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int snd_sc6000_probe(struct device *devptr, unsigned int dev)
|
||||
{
|
||||
return snd_card_free_on_error(devptr, __snd_sc6000_probe(devptr, dev));
|
||||
}
|
||||
|
||||
static struct isa_driver snd_sc6000_driver = {
|
||||
.match = snd_sc6000_match,
|
||||
.probe = snd_sc6000_probe,
|
||||
|
|
Загрузка…
Ссылка в новой задаче