orinoco: Fix an error handling path in spectrum_cs_probe()

[PATCH wireless] orinoco: Fix an error handling path in spectrum_cs_probe()

Posted by Christophe JAILLET 2 years, 8 months ago

Should spectrum_cs_config() fail, some resources need to be released as
already done in the remove function.

While at it, remove a useless and erroneous comment. The probe is
spectrum_cs_probe(), not spectrum_cs_attach().

Fixes: 15b99ac17295 ("[PATCH] pcmcia: add return value to _config() functions")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 drivers/net/wireless/intersil/orinoco/spectrum_cs.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/intersil/orinoco/spectrum_cs.c b/drivers/net/wireless/intersil/orinoco/spectrum_cs.c
index 291ef97ed45e..841d623c621a 100644
--- a/drivers/net/wireless/intersil/orinoco/spectrum_cs.c
+++ b/drivers/net/wireless/intersil/orinoco/spectrum_cs.c
@@ -157,6 +157,7 @@ spectrum_cs_probe(struct pcmcia_device *link)
 {
 	struct orinoco_private *priv;
 	struct orinoco_pccard *card;
+	int ret;
 
 	priv = alloc_orinocodev(sizeof(*card), &link->dev,
 				spectrum_cs_hard_reset,
@@ -169,8 +170,16 @@ spectrum_cs_probe(struct pcmcia_device *link)
 	card->p_dev = link;
 	link->priv = priv;
 
-	return spectrum_cs_config(link);
-}				/* spectrum_cs_attach */
+	ret = spectrum_cs_config(link);
+	if (ret)
+		goto err_free_orinocodev;
+
+	return 0;
+
+err_free_orinocodev:
+	free_orinocodev(priv);
+	return ret;
+}
 
 static void spectrum_cs_detach(struct pcmcia_device *link)
 {
-- 
2.34.1

Re: [wireless] wifi: orinoco: Fix an error handling path in spectrum_cs_probe()

Posted by Kalle Valo 2 years, 8 months ago

Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote:

> Should spectrum_cs_config() fail, some resources need to be released as
> already done in the remove function.
> 
> While at it, remove a useless and erroneous comment. The probe is
> spectrum_cs_probe(), not spectrum_cs_attach().
> 
> Fixes: 15b99ac17295 ("[PATCH] pcmcia: add return value to _config() functions")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> Reviewed-by: Simon Horman <simon.horman@corigine.com>

Patch applied to wireless-next.git, thanks.

925244325159 wifi: orinoco: Fix an error handling path in spectrum_cs_probe()

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/c0bc0c21c58ca477fc5521607615bafbf2aef8eb.1684567733.git.christophe.jaillet@wanadoo.fr/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Re: [PATCH wireless] orinoco: Fix an error handling path in spectrum_cs_probe()

Posted by Simon Horman 2 years, 8 months ago

On Sat, May 20, 2023 at 09:29:46AM +0200, Christophe JAILLET wrote:
> Should spectrum_cs_config() fail, some resources need to be released as
> already done in the remove function.
> 
> While at it, remove a useless and erroneous comment. The probe is
> spectrum_cs_probe(), not spectrum_cs_attach().
> 
> Fixes: 15b99ac17295 ("[PATCH] pcmcia: add return value to _config() functions")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

Reviewed-by: Simon Horman <simon.horman@corigine.com>