From: Kalle Valo <quic_kvalo@quicinc.com>
Date: Fri, 9 Jun 2023 14:24:31 +0000 (+0300)
Subject: wifi: ath11k: wmi: cleanup error handling in ath11k_wmi_send_init_country_cmd()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=90a9fb5b6618ae070c94b2141ec5de6a2a207eae;p=linux.git

wifi: ath11k: wmi: cleanup error handling in ath11k_wmi_send_init_country_cmd()

The error handling doesn't follow the preferred style so fix that.

Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23

Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20230609142440.24643-7-kvalo@kernel.org
---

diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c
index 6ce36879a5037..3b26e227e80c3 100644
--- a/drivers/net/wireless/ath/ath11k/wmi.c
+++ b/drivers/net/wireless/ath/ath11k/wmi.c
@@ -2866,21 +2866,25 @@ ath11k_wmi_send_init_country_cmd(struct ath11k *ar,
 		cmd->cc_info.regdom_id = init_cc_params.cc_info.regdom_id;
 		break;
 	default:
+		ath11k_warn(ar->ab, "unknown cc params flags: 0x%x",
+			    init_cc_params.flags);
 		ret = -EINVAL;
-		goto out;
+		goto err;
 	}
 
 	ret = ath11k_wmi_cmd_send(wmi, skb,
 				  WMI_SET_INIT_COUNTRY_CMDID);
-
-out:
 	if (ret) {
 		ath11k_warn(ar->ab,
 			    "failed to send WMI_SET_INIT_COUNTRY CMD :%d\n",
 			    ret);
-		dev_kfree_skb(skb);
+		goto err;
 	}
 
+	return 0;
+
+err:
+	dev_kfree_skb(skb);
 	return ret;
 }