Commit add539f7 authored May 20, 2023 by Christophe JAILLET Committed by Greg Kroah-Hartman Jul 27, 2023

wifi: atmel: Fix an error handling path in atmel_probe()



[ Upstream commit 6b92e4351a29af52c285fe235e6e4d1a75de04b2 ]

Should atmel_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
atmel_probe(), not atmel_attach().

Fixes: 15b99ac1 ("[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/1e65f174607a83348034197fa7d603bab10ba4a9.1684569156.git.christophe.jaillet@wanadoo.fr


Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 5b06f702

drivers/net/wireless/atmel/atmel_cs.c

+11 −2

Original line number	Diff line number	Diff line
		@@ -73,6 +73,7 @@ struct local_info {
		static int atmel_probe(struct pcmcia_device *p_dev)
		{
		struct local_info *local;
		int ret;

		dev_dbg(&p_dev->dev, "atmel_attach()\n");

		@@ -83,8 +84,16 @@ static int atmel_probe(struct pcmcia_device *p_dev)

		p_dev->priv = local;

		return atmel_config(p_dev);
		} /* atmel_attach */
		ret = atmel_config(p_dev);
		if (ret)
		goto err_free_priv;

		return 0;

		err_free_priv:
		kfree(p_dev->priv);
		return ret;
		}

		static void atmel_detach(struct pcmcia_device *link)
		{