]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
ath10k: Release some resources in an error handling path
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Tue, 24 Nov 2020 15:59:18 +0000 (17:59 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 29 Dec 2020 12:46:57 +0000 (13:46 +0100)
[ 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

index f4e6d84bfb91c3ce32de568fb6538a4acc2698b4..16d5fe6d1e2e497ed97acf01dabc5d0c4d815724 100644 (file)
@@ -1032,7 +1032,7 @@ static int ath10k_usb_probe(struct usb_interface *interface,
        ret = ath10k_core_register(ar, chip_id);
        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 */
@@ -1040,6 +1040,9 @@ static int ath10k_usb_probe(struct usb_interface *interface,
 
        return 0;
 
+err_usb_destroy:
+       ath10k_usb_destroy(ar);
+
 err:
        ath10k_core_destroy(ar);