Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca4a2955 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman
Browse files

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



[ Upstream commit 925244325159824385209e3e0e3f91fa6bf0646c ]

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: 15b99ac1 ("[PATCH] pcmcia: add return value to _config() functions")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/c0bc0c21c58ca477fc5521607615bafbf2aef8eb.1684567733.git.christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 91c3325d

drivers/net/wireless/intersil/orinoco/spectrum_cs.c

+11 −2
Original line number Diff line number Diff line
@@ -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)

{