Commit 0010ba63 authored by Tak-Shing Chan's avatar Tak-Shing Chan Committed by Linus Torvalds

[PATCH] 1111/1: Re: Anakin framebuffer

Resource accounting fix (Anakin framebuffer).
parent 0c686811
...@@ -180,7 +180,7 @@ anakinfb_init(void) ...@@ -180,7 +180,7 @@ anakinfb_init(void)
{ {
memset(&fb_info, 0, sizeof(struct fb_info)); memset(&fb_info, 0, sizeof(struct fb_info));
strcpy(fb_info.modename, "AnakinFB"); strcpy(fb_info.modename, "AnakinFB");
fb_info.node = -1; fb_info.node = NODEV;
fb_info.flags = FBINFO_FLAG_DEFAULT; fb_info.flags = FBINFO_FLAG_DEFAULT;
fb_info.fbops = &anakinfb_ops; fb_info.fbops = &anakinfb_ops;
fb_info.disp = &display; fb_info.disp = &display;
...@@ -192,7 +192,12 @@ anakinfb_init(void) ...@@ -192,7 +192,12 @@ anakinfb_init(void)
memset(&display, 0, sizeof(struct display)); memset(&display, 0, sizeof(struct display));
anakinfb_get_var(&display.var, 0, &fb_info); anakinfb_get_var(&display.var, 0, &fb_info);
display.screen_base = ioremap(VGA_START, VGA_SIZE); if (!(request_mem_region(VGA_START, VGA_SIZE, "vga")))
return -ENOMEM;
if (!(display.screen_base = ioremap(VGA_START, VGA_SIZE))) {
release_mem_region(VGA_START, VGA_SIZE);
return -EIO;
}
display.visual = FB_VISUAL_TRUECOLOR; display.visual = FB_VISUAL_TRUECOLOR;
display.type = FB_TYPE_PACKED_PIXELS; display.type = FB_TYPE_PACKED_PIXELS;
display.type_aux = 0; display.type_aux = 0;
...@@ -209,8 +214,11 @@ anakinfb_init(void) ...@@ -209,8 +214,11 @@ anakinfb_init(void)
display.dispsw = &fbcon_dummy; display.dispsw = &fbcon_dummy;
#endif #endif
if (register_framebuffer(&fb_info) < 0) if (register_framebuffer(&fb_info) < 0) {
iounmap(display.screen_base);
release_mem_region(VGA_START, VGA_SIZE);
return -EINVAL; return -EINVAL;
}
MOD_INC_USE_COUNT; MOD_INC_USE_COUNT;
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment