]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
can: sja1000_isa: sja1000_isa_probe(): add missing free_sja1000dev()
authorZhang Changzhong <zhangchangzhong@huawei.com>
Fri, 11 Nov 2022 12:08:41 +0000 (20:08 +0800)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Wed, 14 Dec 2022 13:02:49 +0000 (14:02 +0100)
[ Upstream commit 92dfd9310a71d28cefe6a2d5174d43fab240e631 ]

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>
Link: https://lore.kernel.org/all/1668168521-5540-1-git-send-email-zhangchangzhong@huawei.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit d452a71995cb2a2a416c51f947a4717b3bc46f9e)
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
drivers/net/can/sja1000/sja1000_isa.c

index d513fac50718542061f786a75191fe1f25e711bd..db3e767d5320fd1a309d4323246c32c41abcabe2 100644 (file)
@@ -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;
 }