ALSA: cs46xx: Fix missing snd_card_free() call at probe error
commitc5e58c4545
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() manually on the error from the probe callback. Fixes:5bff69b364
("ALSA: cs46xx: Allocate resources with device-managed APIs") Cc: <stable@vger.kernel.org> Reported-and-tested-by: Jan Engelhardt <jengelh@inai.de> Link: https://lore.kernel.org/r/p2p1s96o-746-74p4-s95-61qo1p7782pn@vanv.qr Link: https://lore.kernel.org/r/20220705152336.350-1-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:
Родитель
f768f3ca5f
Коммит
51aab37a66
|
@ -74,36 +74,36 @@ static int snd_card_cs46xx_probe(struct pci_dev *pci,
|
|||
err = snd_cs46xx_create(card, pci,
|
||||
external_amp[dev], thinkpad[dev]);
|
||||
if (err < 0)
|
||||
return err;
|
||||
goto error;
|
||||
card->private_data = chip;
|
||||
chip->accept_valid = mmap_valid[dev];
|
||||
err = snd_cs46xx_pcm(chip, 0);
|
||||
if (err < 0)
|
||||
return err;
|
||||
goto error;
|
||||
#ifdef CONFIG_SND_CS46XX_NEW_DSP
|
||||
err = snd_cs46xx_pcm_rear(chip, 1);
|
||||
if (err < 0)
|
||||
return err;
|
||||
goto error;
|
||||
err = snd_cs46xx_pcm_iec958(chip, 2);
|
||||
if (err < 0)
|
||||
return err;
|
||||
goto error;
|
||||
#endif
|
||||
err = snd_cs46xx_mixer(chip, 2);
|
||||
if (err < 0)
|
||||
return err;
|
||||
goto error;
|
||||
#ifdef CONFIG_SND_CS46XX_NEW_DSP
|
||||
if (chip->nr_ac97_codecs ==2) {
|
||||
err = snd_cs46xx_pcm_center_lfe(chip, 3);
|
||||
if (err < 0)
|
||||
return err;
|
||||
goto error;
|
||||
}
|
||||
#endif
|
||||
err = snd_cs46xx_midi(chip, 0);
|
||||
if (err < 0)
|
||||
return err;
|
||||
goto error;
|
||||
err = snd_cs46xx_start_dsp(chip);
|
||||
if (err < 0)
|
||||
return err;
|
||||
goto error;
|
||||
|
||||
snd_cs46xx_gameport(chip);
|
||||
|
||||
|
@ -117,11 +117,15 @@ static int snd_card_cs46xx_probe(struct pci_dev *pci,
|
|||
|
||||
err = snd_card_register(card);
|
||||
if (err < 0)
|
||||
return err;
|
||||
goto error;
|
||||
|
||||
pci_set_drvdata(pci, card);
|
||||
dev++;
|
||||
return 0;
|
||||
|
||||
error:
|
||||
snd_card_free(card);
|
||||
return err;
|
||||
}
|
||||
|
||||
static struct pci_driver cs46xx_driver = {
|
||||
|
|
Загрузка…
Ссылка в новой задаче