| From e0a199af0b37305d0a244defc7ec1b7cfff60563 Mon Sep 17 00:00:00 2001 |
| From: Jeffrey Hugo <jeffrey.l.hugo@gmail.com> |
| Date: Wed, 13 Nov 2019 07:40:16 -0800 |
| Subject: [PATCH] ath10k: Fix qmi init error handling |
| |
| commit f8a595a87e93a33a10879f4b856be818d2f53c84 upstream. |
| |
| When ath10k_qmi_init() fails, the error handling does not free the irq |
| resources, which causes an issue if we EPROBE_DEFER as we'll attempt to |
| (re-)register irqs which are already registered. |
| |
| Fix this by doing a power off since we just powered on the hardware, and |
| freeing the irqs as error handling. |
| |
| Fixes: ba94c753ccb4 ("ath10k: add QMI message handshake for wcn3990 client") |
| Signed-off-by: Jeffrey Hugo <jeffrey.l.hugo@gmail.com> |
| Signed-off-by: Kalle Valo <kvalo@codeaurora.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/net/wireless/ath/ath10k/snoc.c b/drivers/net/wireless/ath/ath10k/snoc.c |
| index c0fc96c29bf1..00f442c86fb4 100644 |
| --- a/drivers/net/wireless/ath/ath10k/snoc.c |
| +++ b/drivers/net/wireless/ath/ath10k/snoc.c |
| @@ -1714,13 +1714,16 @@ static int ath10k_snoc_probe(struct platform_device *pdev) |
| ret = ath10k_qmi_init(ar, msa_size); |
| if (ret) { |
| ath10k_warn(ar, "failed to register wlfw qmi client: %d\n", ret); |
| - goto err_core_destroy; |
| + goto err_power_off; |
| } |
| |
| ath10k_dbg(ar, ATH10K_DBG_SNOC, "snoc probe\n"); |
| |
| return 0; |
| |
| +err_power_off: |
| + ath10k_hw_power_off(ar); |
| + |
| err_free_irq: |
| ath10k_snoc_free_irq(ar); |
| |
| -- |
| 2.7.4 |
| |
