X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fvideo%2Fhpfb.c;h=b18486ad8e17fc11fbea0d9c9e657602c10a13da;hb=9b6a51746ffe8d619f1097675d2dc5e303470024;hp=abd920a663a04a2fbbfd8446c1183af83ebf7228;hpb=79072f38909e3d9883317238887460c39ddcc4cb;p=linux-2.6

diff --git a/drivers/video/hpfb.c b/drivers/video/hpfb.c
index abd920a663..b18486ad8e 100644
--- a/drivers/video/hpfb.c
+++ b/drivers/video/hpfb.c
@@ -7,11 +7,9 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
@@ -296,6 +294,8 @@ static int __init hpfb_init_one(unsigned long phys_base, unsigned long virt_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;
 	}