diff options
| author | Takashi Iwai <tiwai@suse.de> | 2022-04-12 13:26:29 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-04-20 10:34:06 +0300 |
| commit | 2dde476107578e22d31799847a3f50cf1f7278b6 (patch) | |
| tree | e3257c6a4a0cb75382af853192a70f86497a1732 /sound | |
| parent | f98476228801fe212e7d6f06ac45e8b38a6f141e (diff) | |
| download | linux-2dde476107578e22d31799847a3f50cf1f7278b6.tar.xz | |
ALSA: cmipci: Fix the missing snd_card_free() call at probe error
commit a59396b1c11823c69c31621198c04def17f3a869 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: 87e082ad84a7 ("ALSA: cmipci: Allocate resources with device-managed APIs")
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20220412102636.16000-33-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/cmipci.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c index dc4232bac749..42fcbed9220c 100644 --- a/sound/pci/cmipci.c +++ b/sound/pci/cmipci.c @@ -3249,15 +3249,19 @@ static int snd_cmipci_probe(struct pci_dev *pci, err = snd_cmipci_create(card, pci, dev); if (err < 0) - return err; + goto error; 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; } #ifdef CONFIG_PM_SLEEP |