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

    commit 71b21f5f8970a87f034138454ebeff0608d24875 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: 7835e0901e24 ("ALSA: intel8x0: Allocate resources with device-managed APIs")
    Cc: <stable@vger.kernel.org>
    Link: https://lore.kernel.org/r/20220412102636.16000-19-tiwai@suse.de
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    sound/pci/intel8x0.c | 10 ++++++++--
    sound/pci/intel8x0m.c | 10 ++++++++--
    2 files changed, 16 insertions(+), 4 deletions(-)

    --- a/sound/pci/intel8x0.c
    +++ b/sound/pci/intel8x0.c
    @@ -3109,8 +3109,8 @@ static int check_default_spdif_aclink(st
    return 0;
    }

    -static int snd_intel8x0_probe(struct pci_dev *pci,
    - const struct pci_device_id *pci_id)
    +static int __snd_intel8x0_probe(struct pci_dev *pci,
    + const struct pci_device_id *pci_id)
    {
    struct snd_card *card;
    struct intel8x0 *chip;
    @@ -3189,6 +3189,12 @@ static int snd_intel8x0_probe(struct pci
    return 0;
    }

    +static int snd_intel8x0_probe(struct pci_dev *pci,
    + const struct pci_device_id *pci_id)
    +{
    + return snd_card_free_on_error(&pci->dev, __snd_intel8x0_probe(pci, pci_id));
    +}
    +
    static struct pci_driver intel8x0_driver = {
    .name = KBUILD_MODNAME,
    .id_table = snd_intel8x0_ids,
    --- a/sound/pci/intel8x0m.c
    +++ b/sound/pci/intel8x0m.c
    @@ -1178,8 +1178,8 @@ static struct shortname_table {
    { 0 },
    };

    -static int snd_intel8x0m_probe(struct pci_dev *pci,
    - const struct pci_device_id *pci_id)
    +static int __snd_intel8x0m_probe(struct pci_dev *pci,
    + const struct pci_device_id *pci_id)
    {
    struct snd_card *card;
    struct intel8x0m *chip;
    @@ -1225,6 +1225,12 @@ static int snd_intel8x0m_probe(struct pc
    return 0;
    }

    +static int snd_intel8x0m_probe(struct pci_dev *pci,
    + const struct pci_device_id *pci_id)
    +{
    + return snd_card_free_on_error(&pci->dev, __snd_intel8x0m_probe(pci, pci_id));
    +}
    +
    static struct pci_driver intel8x0m_driver = {
    .name = KBUILD_MODNAME,
    .id_table = snd_intel8x0m_ids,

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