Skip to content

Commit

Permalink
fbdev: arcfb: Fix error handling in arcfb_probe()
Browse files Browse the repository at this point in the history
[ Upstream commit 5a6bef7 ]

Smatch complains that:
arcfb_probe() warn: 'irq' from request_irq() not released on lines: 587.

Fix error handling in the arcfb_probe() function. If IO addresses are
not provided or framebuffer registration fails, the code will jump to
the err_addr or err_register_fb label to release resources.
If IRQ request fails, previously allocated resources will be freed.

Fixes: 1154ea7 ("[PATCH] Framebuffer driver for Arc LCD board")
Signed-off-by: Zongjie Li <u202112089@hust.edu.cn>
Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Zongjie Li authored and gregkh committed May 24, 2023
1 parent dcd2891 commit 5a08a72
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions drivers/video/fbdev/arcfb.c
Expand Up @@ -523,7 +523,7 @@ static int arcfb_probe(struct platform_device *dev)

info = framebuffer_alloc(sizeof(struct arcfb_par), &dev->dev);
if (!info)
goto err;
goto err_fb_alloc;

info->screen_base = (char __iomem *)videomemory;
info->fbops = &arcfb_ops;
Expand All @@ -535,7 +535,7 @@ static int arcfb_probe(struct platform_device *dev)

if (!dio_addr || !cio_addr || !c2io_addr) {
printk(KERN_WARNING "no IO addresses supplied\n");
goto err1;
goto err_addr;
}
par->dio_addr = dio_addr;
par->cio_addr = cio_addr;
Expand All @@ -551,12 +551,12 @@ static int arcfb_probe(struct platform_device *dev)
printk(KERN_INFO
"arcfb: Failed req IRQ %d\n", par->irq);
retval = -EBUSY;
goto err1;
goto err_addr;
}
}
retval = register_framebuffer(info);
if (retval < 0)
goto err1;
goto err_register_fb;
platform_set_drvdata(dev, info);
fb_info(info, "Arc frame buffer device, using %dK of video memory\n",
videomemorysize >> 10);
Expand All @@ -580,9 +580,12 @@ static int arcfb_probe(struct platform_device *dev)
}

return 0;
err1:

err_register_fb:
free_irq(par->irq, info);
err_addr:
framebuffer_release(info);
err:
err_fb_alloc:
vfree(videomemory);
return retval;
}
Expand Down

0 comments on commit 5a08a72

Please sign in to comment.