* [PATCH wireless] atmel: Fix an error handling path in atmel_probe()
@ 2023-05-20 7:53 Christophe JAILLET
2023-05-25 9:22 ` Simon Horman
2023-05-25 16:16 ` [wireless] wifi: " Kalle Valo
0 siblings, 2 replies; 3+ messages in thread
From: Christophe JAILLET @ 2023-05-20 7:53 UTC (permalink / raw)
To: Simon Kelley, Kalle Valo, Dominik Brodowski
Cc: linux-kernel, kernel-janitors, Christophe JAILLET, linux-wireless
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: 15b99ac17295 ("[PATCH] pcmcia: add return value to _config() functions")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
drivers/net/wireless/atmel/atmel_cs.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/atmel/atmel_cs.c b/drivers/net/wireless/atmel/atmel_cs.c
index 453bb84cb338..58bba9875d36 100644
--- a/drivers/net/wireless/atmel/atmel_cs.c
+++ b/drivers/net/wireless/atmel/atmel_cs.c
@@ -72,6 +72,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");
@@ -82,8 +83,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)
{
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH wireless] atmel: Fix an error handling path in atmel_probe()
2023-05-20 7:53 [PATCH wireless] atmel: Fix an error handling path in atmel_probe() Christophe JAILLET
@ 2023-05-25 9:22 ` Simon Horman
2023-05-25 16:16 ` [wireless] wifi: " Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Simon Horman @ 2023-05-25 9:22 UTC (permalink / raw)
To: Christophe JAILLET
Cc: Simon Kelley, Kalle Valo, Dominik Brodowski, linux-kernel,
kernel-janitors, linux-wireless
On Sat, May 20, 2023 at 09:53:14AM +0200, Christophe JAILLET wrote:
> 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: 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>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [wireless] wifi: atmel: Fix an error handling path in atmel_probe()
2023-05-20 7:53 [PATCH wireless] atmel: Fix an error handling path in atmel_probe() Christophe JAILLET
2023-05-25 9:22 ` Simon Horman
@ 2023-05-25 16:16 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2023-05-25 16:16 UTC (permalink / raw)
To: Christophe JAILLET
Cc: Simon Kelley, Dominik Brodowski, linux-kernel, kernel-janitors,
Christophe JAILLET, linux-wireless
Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote:
> 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: 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.
6b92e4351a29 wifi: atmel: Fix an error handling path in atmel_probe()
--
https://patchwork.kernel.org/project/linux-wireless/patch/1e65f174607a83348034197fa7d603bab10ba4a9.1684569156.git.christophe.jaillet@wanadoo.fr/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-05-25 16:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-20 7:53 [PATCH wireless] atmel: Fix an error handling path in atmel_probe() Christophe JAILLET
2023-05-25 9:22 ` Simon Horman
2023-05-25 16:16 ` [wireless] wifi: " Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).