From: Bjorn Andersson <bjorn.andersson@linaro.org>
To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: kvalo@codeaurora.org, davem@davemloft.net, marcel@holtmann.org,
andy.gross@linaro.org, wcn36xx@lists.infradead.org,
linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] wcn36xx: Fix error handling path in 'wcn36xx_probe()'
Date: Wed, 6 May 2020 21:52:55 -0700 [thread overview]
Message-ID: <20200507045255.GB3236072@builder.lan> (raw)
In-Reply-To: <20200507043619.200051-1-christophe.jaillet@wanadoo.fr>
On Wed 06 May 21:36 PDT 2020, Christophe JAILLET wrote:
> 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")
It seems I introduced this bug in f303a9311065 ("wcn36xx: Transition
driver to SMD client"), but your patch should should apply back to your
Fixes, so I think it's good.
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Regards,
Bjorn
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> Not 100% sure of the commit for Fixes, but it is consistent with the
> analysis in efad8396e906 where the same call has been added in the remove
> function.
> ---
> drivers/net/wireless/ath/wcn36xx/main.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c
> index e49c306e0eef..1acdc13a74fc 100644
> --- 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_channel;
> } 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_channel;
>
> 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_channel:
> + rpmsg_destroy_ept(wcn->smd_channel);
> out_wq:
> ieee80211_free_hw(hw);
> out_err:
> --
> 2.25.1
>
next prev parent reply other threads:[~2020-05-07 4:52 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-07 4:36 [PATCH] wcn36xx: Fix error handling path in 'wcn36xx_probe()' Christophe JAILLET
2020-05-07 4:52 ` Bjorn Andersson [this message]
2020-05-11 12:37 ` Kalle Valo
-- strict thread matches above, loose matches on Subject: below --
2020-05-07 17:39 [PATCH] wcn36xx: Fix error handling path in wcn36xx_probe() Markus Elfring
2020-05-07 17:47 ` Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200507045255.GB3236072@builder.lan \
--to=bjorn.andersson@linaro.org \
--cc=andy.gross@linaro.org \
--cc=christophe.jaillet@wanadoo.fr \
--cc=davem@davemloft.net \
--cc=kernel-janitors@vger.kernel.org \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=marcel@holtmann.org \
--cc=netdev@vger.kernel.org \
--cc=wcn36xx@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).