Commit 49fe36e1 authored Apr 12, 2022 by Takashi Iwai

ALSA: azt3328: 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() on the error from the
probe callback using a new helper function.

Fixes: 8c5823ef ("ALSA: azt3328: Allocate resources with device-managed APIs")
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20220412102636.16000-9-tiwai@suse.de


Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent b093de14

sound/pci/azt3328.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -2427,7 +2427,7 @@ snd_azf3328_create(struct snd_card *card,
		}

		static int
		snd_azf3328_probe(struct pci_dev pci, const struct pci_device_id pci_id)
		__snd_azf3328_probe(struct pci_dev pci, const struct pci_device_id pci_id)
		{
		static int dev;
		struct snd_card *card;
		@@ -2520,6 +2520,12 @@ snd_azf3328_probe(struct pci_dev pci, const struct pci_device_id pci_id)
		return 0;
		}

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

		#ifdef CONFIG_PM_SLEEP
		static inline void
		snd_azf3328_suspend_regs(const struct snd_azf3328 *chip,