wcn36xx: Fix error handling path in 'wcn36xx_probe()'

In case of error, 'qcom_wcnss_open_channel()' must be undone by a call to
'rpmsg_destroy_ept()', as already done in the remove function.

Fixes: 5052de8deff5 ("soc: qcom: smd: Transition client drivers from smd to rpmsg")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200507043619.200051-1-christophe.jaillet@wanadoo.fr

diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c
index e49c306e0eefdf062167f1f3736785d384fbe869..702b689c06df3c29becaf3952cf5630411bb19af 100644 (file)
--- a/drivers/net/wireless/ath/wcn36xx/main.c
+++ b/drivers/net/wireless/ath/wcn36xx/main.c
@@ -1339,7 +1339,7 @@ static int wcn36xx_probe(struct platform_device *pdev)
        if (addr && ret != ETH_ALEN) {
                wcn36xx_err("invalid local-mac-address\n");
                ret = -EINVAL;
-               goto out_wq;
+               goto out_destroy_ept;
        } else if (addr) {
                wcn36xx_info("mac address: %pM\n", addr);
                SET_IEEE80211_PERM_ADDR(wcn->hw, addr);
@@ -1347,7 +1347,7 @@ static int wcn36xx_probe(struct platform_device *pdev)
 
        ret = wcn36xx_platform_get_resources(wcn, pdev);
        if (ret)
-               goto out_wq;
+               goto out_destroy_ept;
 
        wcn36xx_init_ieee80211(wcn);
        ret = ieee80211_register_hw(wcn->hw);
@@ -1359,6 +1359,8 @@ static int wcn36xx_probe(struct platform_device *pdev)
 out_unmap:
        iounmap(wcn->ccu_base);
        iounmap(wcn->dxe_base);
+out_destroy_ept:
+       rpmsg_destroy_ept(wcn->smd_channel);
 out_wq:
        ieee80211_free_hw(hw);
 out_err: