lkml.org 
[lkml]   [2022]   [Apr]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 024/189] ALSA: azt3328: Fix the missing snd_card_free() call at probe error
    Date
    From: Takashi Iwai <tiwai@suse.de>

    commit 49fe36e1c02cb06f66689c888e4e767c31cd259d upstream.

    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: 8c5823ef31e1 ("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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    sound/pci/azt3328.c | 8 +++++++-
    1 file changed, 7 insertions(+), 1 deletion(-)

    diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c
    index 089050470ff2..7f329dfc5404 100644
    --- a/sound/pci/azt3328.c
    +++ b/sound/pci/azt3328.c
    @@ -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,
    --
    2.35.2


    \
     
     \ /
      Last update: 2022-04-18 14:42    [W:4.018 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site