Commit bf4067e8 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: aw2: Fix the missing snd_card_free() call at probe error

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: 33631012 ("ALSA: aw2: Allocate resources with device-managed APIs")
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20220412102636.16000-32-tiwai@suse.deSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ab8bce9d
...@@ -275,7 +275,7 @@ static int snd_aw2_probe(struct pci_dev *pci, ...@@ -275,7 +275,7 @@ static int snd_aw2_probe(struct pci_dev *pci,
/* (3) Create main component */ /* (3) Create main component */
err = snd_aw2_create(card, pci); err = snd_aw2_create(card, pci);
if (err < 0) if (err < 0)
return err; goto error;
/* initialize mutex */ /* initialize mutex */
mutex_init(&chip->mtx); mutex_init(&chip->mtx);
...@@ -294,13 +294,17 @@ static int snd_aw2_probe(struct pci_dev *pci, ...@@ -294,13 +294,17 @@ static int snd_aw2_probe(struct pci_dev *pci,
/* (6) Register card instance */ /* (6) Register card instance */
err = snd_card_register(card); err = snd_card_register(card);
if (err < 0) if (err < 0)
return err; goto error;
/* (7) Set PCI driver data */ /* (7) Set PCI driver data */
pci_set_drvdata(pci, card); pci_set_drvdata(pci, card);
dev++; dev++;
return 0; return 0;
error:
snd_card_free(card);
return err;
} }
/* open callback */ /* open callback */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment