X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fvideo%2Fatafb.c;h=bffe2b946344b37881f0fed387965562b357724d;hb=42eaf0d8f2e7b8201afc00b0ebe1bd89ea51d42d;hp=02c41a626fa25c2fa5d280e527fb3f8e6236ff71;hpb=946b92437e550d6ed80213bf54a1f383e141aede;p=pandora-kernel.git diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c index 02c41a626fa2..bffe2b946344 100644 --- a/drivers/video/atafb.c +++ b/drivers/video/atafb.c @@ -49,7 +49,6 @@ #include #include -#include #include #include #include @@ -2804,8 +2803,19 @@ int __init atafb_init(void) atafb_set_disp(-1, &fb_info); do_install_cmap(0, &fb_info); - if (register_framebuffer(&fb_info) < 0) + if (register_framebuffer(&fb_info) < 0) { +#ifdef ATAFB_EXT + if (external_addr) { + iounmap(external_addr); + external_addr = NULL; + } + if (external_vgaiobase) { + iounmap((void*)external_vgaiobase); + external_vgaiobase = 0; + } +#endif return -EINVAL; + } printk("Determined %dx%d, depth %d\n", disp.var.xres, disp.var.yres, disp.var.bits_per_pixel);