| Message ID | 1e65f174607a83348034197fa7d603bab10ba4a9.1684569156.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6b92e4351a29af52c285fe235e6e4d1a75de04b2 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [wireless] atmel: Fix an error handling path in atmel_probe() | expand |
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>
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()
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) {
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(-)