Skip to content

Commit

Permalink
ALSA: rme32: Fix the missing snd_card_free() call at probe error
Browse files Browse the repository at this point in the history
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: 102e615 ("ALSA: rme32: Allocate resources with device-managed APIs")
Cc: <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Takashi Iwai <[email protected]>
  • Loading branch information
tiwai committed Apr 12, 2022
1 parent 348f08d commit 55d2d04
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion sound/pci/rme32.c
Original file line number Diff line number Diff line change
Expand Up @@ -1875,7 +1875,7 @@ static void snd_rme32_card_free(struct snd_card *card)
}

static int
snd_rme32_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
__snd_rme32_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
{
static int dev;
struct rme32 *rme32;
Expand Down Expand Up @@ -1927,6 +1927,12 @@ snd_rme32_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
return 0;
}

static int
snd_rme32_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
{
return snd_card_free_on_error(&pci->dev, __snd_rme32_probe(pci, pci_id));
}

static struct pci_driver rme32_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_rme32_ids,
Expand Down

0 comments on commit 55d2d04

Please sign in to comment.