* [PATCH] ath10k: sdio: jump to correct label in error handling path
@ 2018-04-26 12:35 Niklas Cassel
2018-04-27 11:40 ` Kalle Valo
0 siblings, 1 reply; 2+ messages in thread
From: Niklas Cassel @ 2018-04-26 12:35 UTC (permalink / raw)
To: Kalle Valo; +Cc: Niklas Cassel, ath10k, linux-wireless, netdev, linux-kernel
Jump to the correct label in error handling path.
At this point of execution create_singlethread_workqueue() has succeeded,
so it should be properly destroyed.
Jump label was renamed in commit ec2c64e20257 ("ath10k: sdio: fix memory
leak for probe allocations").
However, the bug was originally introduced in commit d96db25d2025
("ath10k: add initial SDIO support").
Fixes: d96db25d2025 ("ath10k: add initial SDIO support")
Signed-off-by: Niklas Cassel <niklas.cassel@linaro.org>
---
drivers/net/wireless/ath/ath10k/sdio.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/ath10k/sdio.c b/drivers/net/wireless/ath/ath10k/sdio.c
index 2d04c54a4153..d612ce8c9cff 100644
--- a/drivers/net/wireless/ath/ath10k/sdio.c
+++ b/drivers/net/wireless/ath/ath10k/sdio.c
@@ -2011,7 +2011,7 @@ static int ath10k_sdio_probe(struct sdio_func *func,
ret = -ENODEV;
ath10k_err(ar, "unsupported device id %u (0x%x)\n",
dev_id_base, id->device);
- goto err_core_destroy;
+ goto err_free_wq;
}
ar->id.vendor = id->vendor;
--
2.14.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: ath10k: sdio: jump to correct label in error handling path
2018-04-26 12:35 [PATCH] ath10k: sdio: jump to correct label in error handling path Niklas Cassel
@ 2018-04-27 11:40 ` Kalle Valo
0 siblings, 0 replies; 2+ messages in thread
From: Kalle Valo @ 2018-04-27 11:40 UTC (permalink / raw)
To: Niklas Cassel
Cc: Kalle Valo, Niklas Cassel, ath10k, linux-wireless, netdev, linux-kernel
Niklas Cassel <niklas.cassel@linaro.org> wrote:
> Jump to the correct label in error handling path.
> At this point of execution create_singlethread_workqueue() has succeeded,
> so it should be properly destroyed.
>
> Jump label was renamed in commit ec2c64e20257 ("ath10k: sdio: fix memory
> leak for probe allocations").
> However, the bug was originally introduced in commit d96db25d2025
> ("ath10k: add initial SDIO support").
>
> Fixes: d96db25d2025 ("ath10k: add initial SDIO support")
> Signed-off-by: Niklas Cassel <niklas.cassel@linaro.org>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Patch applied to ath-next branch of ath.git, thanks.
e60a92590187 ath10k: sdio: jump to correct label in error handling path
--
https://patchwork.kernel.org/patch/10365901/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-04-27 11:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-26 12:35 [PATCH] ath10k: sdio: jump to correct label in error handling path Niklas Cassel
2018-04-27 11:40 ` Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).