| Message ID | 1607713210-18320-1-git-send-email-pillair@codeaurora.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 31561e8557cd1eeba5806ac9ce820f8323b2201b |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | ath10k: Fix error handling in case of CE pipe init failure | expand |
On Fri, Dec 11, 2020 at 11:00 AM Rakesh Pillai <pillair@codeaurora.org> wrote: > > 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>
Rakesh Pillai <pillair@codeaurora.org> wrote: > 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> Patch applied to ath-next branch of ath.git, thanks. 31561e8557cd ath10k: Fix error handling in case of CE pipe init failure
diff --git a/drivers/net/wireless/ath/ath10k/snoc.c b/drivers/net/wireless/ath/ath10k/snoc.c index fd41f25..daae470 100644 --- a/drivers/net/wireless/ath/ath10k/snoc.c +++ b/drivers/net/wireless/ath/ath10k/snoc.c @@ -1045,12 +1045,13 @@ static int ath10k_snoc_hif_power_up(struct ath10k *ar, 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; } return 0; -err_wlan_enable: +err_free_rri: + ath10k_ce_free_rri(ar); ath10k_snoc_wlan_disable(ar); return ret;
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> --- drivers/net/wireless/ath/ath10k/snoc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)