* [PATCH wireless] ray_cs: Fix an error handling path in ray_probe()
@ 2023-05-20 8:13 Christophe JAILLET
2023-05-24 10:22 ` Simon Horman
2023-05-25 16:17 ` [wireless] wifi: " Kalle Valo
0 siblings, 2 replies; 3+ messages in thread
From: Christophe JAILLET @ 2023-05-20 8:13 UTC (permalink / raw)
To: Kalle Valo, Dominik Brodowski
Cc: linux-kernel, kernel-janitors, Christophe JAILLET, linux-wireless
Should ray_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
ray_probe(), not ray_attach().
Fixes: 15b99ac17295 ("[PATCH] pcmcia: add return value to _config() functions")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
drivers/net/wireless/legacy/ray_cs.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/legacy/ray_cs.c b/drivers/net/wireless/legacy/ray_cs.c
index 1f57a0055bbd..38782d4c4694 100644
--- a/drivers/net/wireless/legacy/ray_cs.c
+++ b/drivers/net/wireless/legacy/ray_cs.c
@@ -270,13 +270,14 @@ static int ray_probe(struct pcmcia_device *p_dev)
{
ray_dev_t *local;
struct net_device *dev;
+ int ret;
dev_dbg(&p_dev->dev, "ray_attach()\n");
/* Allocate space for private device-specific data */
dev = alloc_etherdev(sizeof(ray_dev_t));
if (!dev)
- goto fail_alloc_dev;
+ return -ENOMEM;
local = netdev_priv(dev);
local->finder = p_dev;
@@ -313,11 +314,16 @@ static int ray_probe(struct pcmcia_device *p_dev)
timer_setup(&local->timer, NULL, 0);
this_device = p_dev;
- return ray_config(p_dev);
+ ret = ray_config(p_dev);
+ if (ret)
+ goto err_free_dev;
+
+ return 0;
-fail_alloc_dev:
- return -ENOMEM;
-} /* ray_attach */
+err_free_dev:
+ free_netdev(dev);
+ return ret;
+}
static void ray_detach(struct pcmcia_device *link)
{
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH wireless] ray_cs: Fix an error handling path in ray_probe()
2023-05-20 8:13 [PATCH wireless] ray_cs: Fix an error handling path in ray_probe() Christophe JAILLET
@ 2023-05-24 10:22 ` Simon Horman
2023-05-25 16:17 ` [wireless] wifi: " Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Simon Horman @ 2023-05-24 10:22 UTC (permalink / raw)
To: Christophe JAILLET
Cc: Kalle Valo, Dominik Brodowski, linux-kernel, kernel-janitors,
linux-wireless
On Sat, May 20, 2023 at 10:13:22AM +0200, Christophe JAILLET wrote:
> Should ray_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
> ray_probe(), not ray_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: ray_cs: Fix an error handling path in ray_probe()
2023-05-20 8:13 [PATCH wireless] ray_cs: Fix an error handling path in ray_probe() Christophe JAILLET
2023-05-24 10:22 ` Simon Horman
@ 2023-05-25 16:17 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2023-05-25 16:17 UTC (permalink / raw)
To: Christophe JAILLET
Cc: Dominik Brodowski, linux-kernel, kernel-janitors,
Christophe JAILLET, linux-wireless
Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote:
> Should ray_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
> ray_probe(), not ray_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.
4f8d66a9fb2e wifi: ray_cs: Fix an error handling path in ray_probe()
--
https://patchwork.kernel.org/project/linux-wireless/patch/8c544d18084f8b37dd108e844f7e79e85ff708ff.1684570373.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:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-20 8:13 [PATCH wireless] ray_cs: Fix an error handling path in ray_probe() Christophe JAILLET
2023-05-24 10:22 ` Simon Horman
2023-05-25 16:17 ` [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).