[1/3] can: sja1000_isa: add missing free_sja1000dev() in sja1000_isa_probe()

Message ID 1668168521-5540-1-git-send-email-zhangchangzhong@huawei.com
State New
Headers
Series [1/3] can: sja1000_isa: add missing free_sja1000dev() in sja1000_isa_probe() |

Commit Message

Zhang Changzhong Nov. 11, 2022, 12:08 p.m. UTC
  Add the missing free_sja1000dev() before return from sja1000_isa_probe()
in the register_sja1000dev() error handling case.

In addition, remove blanks before goto labels.

Fixes: 2a6ba39ad6a2 ("can: sja1000: legacy SJA1000 ISA bus driver")
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
---
 drivers/net/can/sja1000/sja1000_isa.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
  

Comments

Marc Kleine-Budde Nov. 24, 2022, 3:10 p.m. UTC | #1
On 11.11.2022 20:08:41, Zhang Changzhong wrote:
> Add the missing free_sja1000dev() before return from sja1000_isa_probe()
> in the register_sja1000dev() error handling case.
> 
> In addition, remove blanks before goto labels.
> 
> Fixes: 2a6ba39ad6a2 ("can: sja1000: legacy SJA1000 ISA bus driver")
> Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>

Applied to linux-can.

Marc
  

Patch

diff --git a/drivers/net/can/sja1000/sja1000_isa.c b/drivers/net/can/sja1000/sja1000_isa.c
index d513fac..db3e767 100644
--- a/drivers/net/can/sja1000/sja1000_isa.c
+++ b/drivers/net/can/sja1000/sja1000_isa.c
@@ -202,22 +202,24 @@  static int sja1000_isa_probe(struct platform_device *pdev)
 	if (err) {
 		dev_err(&pdev->dev, "registering %s failed (err=%d)\n",
 			DRV_NAME, err);
-		goto exit_unmap;
+		goto exit_free;
 	}
 
 	dev_info(&pdev->dev, "%s device registered (reg_base=0x%p, irq=%d)\n",
 		 DRV_NAME, priv->reg_base, dev->irq);
 	return 0;
 
- exit_unmap:
+exit_free:
+	free_sja1000dev(dev);
+exit_unmap:
 	if (mem[idx])
 		iounmap(base);
- exit_release:
+exit_release:
 	if (mem[idx])
 		release_mem_region(mem[idx], iosize);
 	else
 		release_region(port[idx], iosize);
- exit:
+exit:
 	return err;
 }