summaryrefslogtreecommitdiffstats
path: root/drivers/video/hpfb.c
diff options
context:
space:
mode:
authorEmil Goode <emilgoode@gmail.com>2012-08-20 20:32:25 +0200
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2012-09-22 21:16:20 +0000
commit58fc6ef6f8c8ae06a82f7dd3ae1fa09d4fcfc875 (patch)
tree53f5a9924c9f8245d849ec6dd9e298a9aafbdaa2 /drivers/video/hpfb.c
parentbcfbeecea11c15e243f076d37d637c2598aff4fe (diff)
downloadop-kernel-dev-58fc6ef6f8c8ae06a82f7dd3ae1fa09d4fcfc875.zip
op-kernel-dev-58fc6ef6f8c8ae06a82f7dd3ae1fa09d4fcfc875.tar.gz
video: hpfb: Fix error handling
This patch solves problems with the error handling by introducing labels for proper error paths and it also frees resources that where missed. Signed-off-by: Emil Goode <emilgoode@gmail.com> Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Diffstat (limited to 'drivers/video/hpfb.c')
-rw-r--r--drivers/video/hpfb.c28
1 files changed, 21 insertions, 7 deletions
diff --git a/drivers/video/hpfb.c b/drivers/video/hpfb.c
index ebf8495..7324865 100644
--- a/drivers/video/hpfb.c
+++ b/drivers/video/hpfb.c
@@ -210,6 +210,7 @@ static int __devinit hpfb_init_one(unsigned long phys_base,
unsigned long virt_base)
{
unsigned long fboff, fb_width, fb_height, fb_start;
+ int ret;
fb_regs = virt_base;
fboff = (in_8(fb_regs + HPFB_FBOMSB) << 8) | in_8(fb_regs + HPFB_FBOLSB);
@@ -290,19 +291,29 @@ static int __devinit hpfb_init_one(unsigned long phys_base,
fb_info.var = hpfb_defined;
fb_info.screen_base = (char *)fb_start;
- fb_alloc_cmap(&fb_info.cmap, 1 << hpfb_defined.bits_per_pixel, 0);
+ ret = fb_alloc_cmap(&fb_info.cmap, 1 << hpfb_defined.bits_per_pixel, 0);
+ if (ret < 0)
+ goto unmap_screen_base;
- if (register_framebuffer(&fb_info) < 0) {
- fb_dealloc_cmap(&fb_info.cmap);
- iounmap(fb_info.screen_base);
- fb_info.screen_base = NULL;
- return 1;
- }
+ ret = register_framebuffer(&fb_info);
+ if (ret < 0)
+ goto dealloc_cmap;
printk(KERN_INFO "fb%d: %s frame buffer device\n",
fb_info.node, fb_info.fix.id);
return 0;
+
+dealloc_cmap:
+ fb_dealloc_cmap(&fb_info.cmap);
+
+unmap_screen_base:
+ if (fb_info.screen_base) {
+ iounmap(fb_info.screen_base);
+ fb_info.screen_base = NULL;
+ }
+
+ return ret;
}
/*
@@ -345,6 +356,9 @@ static void __devexit hpfb_remove_one(struct dio_dev *d)
if (d->scode >= DIOII_SCBASE)
iounmap((void *)fb_regs);
release_mem_region(d->resource.start, resource_size(&d->resource));
+ fb_dealloc_cmap(&fb_info.cmap);
+ if (fb_info.screen_base)
+ iounmap(fb_info.screen_base);
}
static struct dio_device_id hpfb_dio_tbl[] = {
OpenPOWER on IntegriCloud