From: Yingying Tang Date: Wed, 23 Apr 2025 05:56:50 +0000 (+0530) Subject: wifi: ath12k: Adjust the process of resource release for ahb bus X-Git-Tag: v6.16-rc1~132^2~46^2~1^2~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=167e6fc7a4471db2c88bb8da32ac444734a41cea;p=thirdparty%2Flinux.git wifi: ath12k: Adjust the process of resource release for ahb bus Due to the change in the resource release order in ath12k_core_deinit(), the resource release order in the AHB bus removal process needs to be adjusted accordingly. Tested-on: IPQ5332 hw1.0 AHB WLAN.WBE.1.3.1-00130-QCAHKSWPL_SILICONZ-1 Fixes: 6cee30f0da75 ("wifi: ath12k: add AHB driver support for IPQ5332") Signed-off-by: Yingying Tang Reviewed-by: Vasanthakumar Thiagarajan Link: https://patch.msgid.link/20250423055650.16230-3-quic_yintang@quicinc.com Signed-off-by: Jeff Johnson --- diff --git a/drivers/net/wireless/ath/ath12k/ahb.c b/drivers/net/wireless/ath/ath12k/ahb.c index 636dfe237a794..8d1a86e420a43 100644 --- a/drivers/net/wireless/ath/ath12k/ahb.c +++ b/drivers/net/wireless/ath/ath12k/ahb.c @@ -1125,14 +1125,13 @@ static void ath12k_ahb_remove(struct platform_device *pdev) if (test_bit(ATH12K_FLAG_QMI_FAIL, &ab->dev_flags)) { ath12k_ahb_power_down(ab, false); - ath12k_qmi_deinit_service(ab); goto qmi_fail; } ath12k_ahb_remove_prepare(ab); - ath12k_core_deinit(ab); - + ath12k_core_hw_group_cleanup(ab->ag); qmi_fail: + ath12k_core_deinit(ab); ath12k_ahb_free_resources(ab); }