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.17 029/219] ALSA: cs4281: Fix the missing snd_card_free() call at probe error
    Date
    From: Takashi Iwai <tiwai@suse.de>

    commit 9bf5ed9a4e623583f15202d99f4521bc39050f61 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: 99041fea70d0 ("ALSA: cs4281: Allocate resources with device-managed APIs")
    Cc: <stable@vger.kernel.org>
    Link: https://lore.kernel.org/r/20220412102636.16000-11-tiwai@suse.de
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    sound/pci/cs4281.c | 10 ++++++++--
    1 file changed, 8 insertions(+), 2 deletions(-)

    --- a/sound/pci/cs4281.c
    +++ b/sound/pci/cs4281.c
    @@ -1827,8 +1827,8 @@ static void snd_cs4281_opl3_command(stru
    spin_unlock_irqrestore(&opl3->reg_lock, flags);
    }

    -static int snd_cs4281_probe(struct pci_dev *pci,
    - const struct pci_device_id *pci_id)
    +static int __snd_cs4281_probe(struct pci_dev *pci,
    + const struct pci_device_id *pci_id)
    {
    static int dev;
    struct snd_card *card;
    @@ -1888,6 +1888,12 @@ static int snd_cs4281_probe(struct pci_d
    return 0;
    }

    +static int snd_cs4281_probe(struct pci_dev *pci,
    + const struct pci_device_id *pci_id)
    +{
    + return snd_card_free_on_error(&pci->dev, __snd_cs4281_probe(pci, pci_id));
    +}
    +
    /*
    * Power Management
    */

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