Skip to content

Commit

Permalink
ALSA: aw2: 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() manually on the error
from the probe callback.

Fixes: 3363101 ("ALSA: aw2: 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 ab8bce9 commit bf4067e
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions sound/pci/aw2/aw2-alsa.c
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ static int snd_aw2_probe(struct pci_dev *pci,
/* (3) Create main component */
err = snd_aw2_create(card, pci);
if (err < 0)
return err;
goto error;

/* initialize mutex */
mutex_init(&chip->mtx);
Expand All @@ -294,13 +294,17 @@ static int snd_aw2_probe(struct pci_dev *pci,
/* (6) Register card instance */
err = snd_card_register(card);
if (err < 0)
return err;
goto error;

/* (7) Set PCI driver data */
pci_set_drvdata(pci, card);

dev++;
return 0;

error:
snd_card_free(card);
return err;
}

/* open callback */
Expand Down

0 comments on commit bf4067e

Please sign in to comment.