wifi: orinoco: Fix an error handling path in spectrum_cs_probe()
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Sat, 20 May 2023 07:29:46 +0000 (09:29 +0200)
committerKalle Valo <kvalo@kernel.org>
Thu, 25 May 2023 16:15:09 +0000 (19:15 +0300)
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>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/c0bc0c21c58ca477fc5521607615bafbf2aef8eb.1684567733.git.christophe.jaillet@wanadoo.fr
drivers/net/wireless/intersil/orinoco/spectrum_cs.c

index 291ef97..841d623 100644 (file)
@@ -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)
 {