From 31561e8557cd1eeba5806ac9ce820f8323b2201b Mon Sep 17 00:00:00 2001

From: Rakesh Pillai <pillair@codeaurora.org>

Date: Sat, 12 Dec 2020 00:30:10 +0530

Subject: [PATCH] ath10k: Fix error handling in case of CE pipe init failure

Git-commit: 31561e8557cd1eeba5806ac9ce820f8323b2201b

References: git-fixes

Patch-mainline: v5.12-rc1

Currently if the copy engine pipe init fails for snoc based

chipsets, the rri is not freed.

Fix this error handling for copy engine pipe init

failure.

Tested-on: WCN3990 hw1.0 SNOC WLAN.HL.3.1-01040-QCAHLSWMTPLZ-1

Fixes: 4945af5b264f ("ath10k: enable SRRI/DRRI support on ddr for WCN3990")

Signed-off-by: Rakesh Pillai <pillair@codeaurora.org>

Reviewed-by: Brian Norris <briannorris@chromium.org>

Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

Link: https://lore.kernel.org/r/1607713210-18320-1-git-send-email-pillair@codeaurora.org

Signed-off-by: Oliver Neukum <oneukum@suse.com>

---

 drivers/net/wireless/ath/ath10k/snoc.c |    5 +++--

 1 file changed, 3 insertions(+), 2 deletions(-)

--- a/drivers/net/wireless/ath/ath10k/snoc.c

+++ b/drivers/net/wireless/ath/ath10k/snoc.c

@@ -789,13 +789,14 @@ static int ath10k_snoc_hif_power_up(stru

 	ret = ath10k_snoc_init_pipes(ar);

 	if (ret) {

 		ath10k_err(ar, "failed to initialize CE: %d\n", ret);

-		goto err_wlan_enable;

+		goto err_free_rri;

 	}

 	napi_enable(&ar->napi);

 	return 0;

-err_wlan_enable:

+err_free_rri:

+	ath10k_ce_free_rri(ar);

 	ath10k_snoc_wlan_disable(ar);

 	return ret;