Skip to content

Commit

Permalink
ALSA: korg1212: 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: b5cde36 ("ALSA: korg1212: 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 71b21f5 commit c01b723
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions sound/pci/korg1212/korg1212.c
Original file line number Diff line number Diff line change
Expand Up @@ -2355,7 +2355,7 @@ snd_korg1212_probe(struct pci_dev *pci,

err = snd_korg1212_create(card, pci);
if (err < 0)
return err;
goto error;

strcpy(card->driver, "korg1212");
strcpy(card->shortname, "korg1212");
Expand All @@ -2366,10 +2366,14 @@ snd_korg1212_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 korg1212_driver = {
Expand Down

0 comments on commit c01b723

Please sign in to comment.