aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGerd Knorr <kraxel@bytesex.org>2005-06-21 20:16:56 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-21 22:07:39 -0400
commit78c03717c415d81879e4dac2e452d1a0d3738a80 (patch)
tree277129e5fbb90a109e65e64e4646861ae85134d5 /drivers
parent27f931dac93057bbae691f66a49b11ff2f483bee (diff)
[PATCH] some vesafb fixes
Fix the size passed to release_mem_region in an error path. Also adjust the message printed when vesafb cannot load; the comment there already says this must not be fatal, so the message should also not mention the word 'abort' otherwise indicating a problem to worry about in the log. Signed-off-by: Jan Beulich <jbeulich@novell.com> Signed-off-by: Gerd Knorr <kraxel@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/vesafb.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index 3027841f9c24..f3069b01e248 100644
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -271,7 +271,7 @@ static int __init vesafb_probe(struct device *device)
271 271
272 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) { 272 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
273 printk(KERN_WARNING 273 printk(KERN_WARNING
274 "vesafb: abort, cannot reserve video memory at 0x%lx\n", 274 "vesafb: cannot reserve video memory at 0x%lx\n",
275 vesafb_fix.smem_start); 275 vesafb_fix.smem_start);
276 /* We cannot make this fatal. Sometimes this comes from magic 276 /* We cannot make this fatal. Sometimes this comes from magic
277 spaces our resource handlers simply don't know about */ 277 spaces our resource handlers simply don't know about */
@@ -279,13 +279,13 @@ static int __init vesafb_probe(struct device *device)
279 279
280 info = framebuffer_alloc(sizeof(u32) * 256, &dev->dev); 280 info = framebuffer_alloc(sizeof(u32) * 256, &dev->dev);
281 if (!info) { 281 if (!info) {
282 release_mem_region(vesafb_fix.smem_start, vesafb_fix.smem_len); 282 release_mem_region(vesafb_fix.smem_start, size_total);
283 return -ENOMEM; 283 return -ENOMEM;
284 } 284 }
285 info->pseudo_palette = info->par; 285 info->pseudo_palette = info->par;
286 info->par = NULL; 286 info->par = NULL;
287 287
288 info->screen_base = ioremap(vesafb_fix.smem_start, vesafb_fix.smem_len); 288 info->screen_base = ioremap(vesafb_fix.smem_start, vesafb_fix.smem_len);
289 if (!info->screen_base) { 289 if (!info->screen_base) {
290 printk(KERN_ERR 290 printk(KERN_ERR
291 "vesafb: abort, cannot ioremap video memory 0x%x @ 0x%lx\n", 291 "vesafb: abort, cannot ioremap video memory 0x%x @ 0x%lx\n",
@@ -386,7 +386,7 @@ static int __init vesafb_probe(struct device *device)
386 request_region(0x3c0, 32, "vesafb"); 386 request_region(0x3c0, 32, "vesafb");
387 387
388 if (mtrr) { 388 if (mtrr) {
389 int temp_size = size_total; 389 unsigned int temp_size = size_total;
390 /* Find the largest power-of-two */ 390 /* Find the largest power-of-two */
391 while (temp_size & (temp_size - 1)) 391 while (temp_size & (temp_size - 1))
392 temp_size &= (temp_size - 1); 392 temp_size &= (temp_size - 1);