lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 265/717] ath10k: Release some resources in an error handling path
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit 6364e693f4a7a89a2fb3dd2cbd6cc06d5fd6e26d ]

    Should an error occur after calling 'ath10k_usb_create()', it should be
    undone by a corresponding 'ath10k_usb_destroy()' call

    Fixes: 4db66499df91 ("ath10k: add initial USB support")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Link: https://lore.kernel.org/r/20201122170358.1346065-1-christophe.jaillet@wanadoo.fr
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/ath/ath10k/usb.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/wireless/ath/ath10k/usb.c b/drivers/net/wireless/ath/ath10k/usb.c
    index 0b47c3a09794c..19b9c27e30e20 100644
    --- a/drivers/net/wireless/ath/ath10k/usb.c
    +++ b/drivers/net/wireless/ath/ath10k/usb.c
    @@ -1011,7 +1011,7 @@ static int ath10k_usb_probe(struct usb_interface *interface,
    ret = ath10k_core_register(ar, &bus_params);
    if (ret) {
    ath10k_warn(ar, "failed to register driver core: %d\n", ret);
    - goto err;
    + goto err_usb_destroy;
    }

    /* TODO: remove this once USB support is fully implemented */
    @@ -1019,6 +1019,9 @@ static int ath10k_usb_probe(struct usb_interface *interface,

    return 0;

    +err_usb_destroy:
    + ath10k_usb_destroy(ar);
    +
    err:
    ath10k_core_destroy(ar);

    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 15:13    [W:2.053 / U:0.556 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site