wifi: orinoco: Fix an error handling path in orinoco_cs_probe()
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Sat, 20 May 2023 07:38:22 +0000 (09:38 +0200)
committerKalle Valo <kvalo@kernel.org>
Thu, 25 May 2023 16:15:40 +0000 (19:15 +0300)
Should orinoco_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
orinoco_cs_probe(), not orinoco_cs_attach().

Fixes: 15b99ac17295 ("[PATCH] pcmcia: add return value to _config() functions")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/e24735ce4d82901d5f7ea08419eea53bfdde3d65.1684568286.git.christophe.jaillet@wanadoo.fr
drivers/net/wireless/intersil/orinoco/orinoco_cs.c

index a956f96..03bfd24 100644 (file)
@@ -96,6 +96,7 @@ orinoco_cs_probe(struct pcmcia_device *link)
 {
        struct orinoco_private *priv;
        struct orinoco_pccard *card;
+       int ret;
 
        priv = alloc_orinocodev(sizeof(*card), &link->dev,
                                orinoco_cs_hard_reset, NULL);
@@ -107,8 +108,16 @@ orinoco_cs_probe(struct pcmcia_device *link)
        card->p_dev = link;
        link->priv = priv;
 
-       return orinoco_cs_config(link);
-}                              /* orinoco_cs_attach */
+       ret = orinoco_cs_config(link);
+       if (ret)
+               goto err_free_orinocodev;
+
+       return 0;
+
+err_free_orinocodev:
+       free_orinocodev(priv);
+       return ret;
+}
 
 static void orinoco_cs_detach(struct pcmcia_device *link)
 {