[PATCH ath-next 2/2] wifi: ath12k: Adjust the process of resource release for ahb bus

[Yingying Tang]

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 <quic_yintang at quicinc.com>
---
 drivers/net/wireless/ath/ath12k/ahb.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/ath/ath12k/ahb.c b/drivers/net/wireless/ath/ath12k/ahb.c
index 1c2171e2bb73..dc5dba4658cd 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);
 }
 
-- 
2.25.1