| Message ID | 20180426123502.23962-1-niklas.cassel@linaro.org |
|---|---|
| State | Accepted |
| Commit | e60a92590187d01f1c98254d2d7e8f613ebd31dd |
| Headers | show |
| Series | ath10k: sdio: jump to correct label in error handling path | expand |
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
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;
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(-) -- 2.14.3