[PATCH 196/379][SRU][OEM-5.6] ath11k: ahb: call ath11k_core_init() before irq configuration
You-Sheng Yang
vicamo.yang at canonical.com
Wed Dec 23 08:48:49 UTC 2020
From: Anilkumar Kolli <akolli at codeaurora.org>
BugLink: https://bugs.launchpad.net/bugs/1879633
This is needed to init .max_radios in hw_params and onfigure external
interrupts for available pdev_ids.
Compile tested only.
Signed-off-by: Anilkumar Kolli <akolli at codeaurora.org>
Signed-off-by: Kalle Valo <kvalo at codeaurora.org>
Link: https://lore.kernel.org/r/1592316055-24958-2-git-send-email-kvalo@codeaurora.org
(cherry picked from commit 166e22b38aa3bcde616534f67b35d6e7e52b5b54)
Signed-off-by: You-Sheng Yang <vicamo.yang at canonical.com>
---
drivers/net/wireless/ath/ath11k/ahb.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/ath/ath11k/ahb.c b/drivers/net/wireless/ath/ath11k/ahb.c
index 30092841ac46..2ea6da7682ce 100644
--- a/drivers/net/wireless/ath/ath11k/ahb.c
+++ b/drivers/net/wireless/ath/ath11k/ahb.c
@@ -951,15 +951,15 @@ static int ath11k_ahb_probe(struct platform_device *pdev)
ath11k_ahb_init_qmi_ce_config(ab);
- ret = ath11k_ahb_config_irq(ab);
+ ret = ath11k_core_init(ab);
if (ret) {
- ath11k_err(ab, "failed to configure irq: %d\n", ret);
+ ath11k_err(ab, "failed to init core: %d\n", ret);
goto err_ce_free;
}
- ret = ath11k_core_init(ab);
+ ret = ath11k_ahb_config_irq(ab);
if (ret) {
- ath11k_err(ab, "failed to init core: %d\n", ret);
+ ath11k_err(ab, "failed to configure irq: %d\n", ret);
goto err_ce_free;
}
--
2.29.2
More information about the kernel-team
mailing list