[patch] some vesafb fixes

[Gerd Knorr]

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@xxxxxxxxxx>
Signed-off-by: Gerd Knorr <kraxel@xxxxxxx>

diff -Npru linux-2.6.12-rc4.base/drivers/video/vesafb.c linux-2.6.12-rc4/drivers/video/vesafb.c
--- linux-2.6.12-rc4.base/drivers/video/vesafb.c	2005-05-11 17:28:18.970188552 +0200
+++ linux-2.6.12-rc4/drivers/video/vesafb.c	2005-05-11 17:50:36.285885664 +0200
@@ -271,7 +271,7 @@ static int __init vesafb_probe(struct de
 
 	if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
 		printk(KERN_WARNING
-		       "vesafb: abort, cannot reserve video memory at 0x%lx\n",
+		       "vesafb: cannot reserve video memory at 0x%lx\n",
 			vesafb_fix.smem_start);
 		/* We cannot make this fatal. Sometimes this comes from magic
 		   spaces our resource handlers simply don't know about */
@@ -279,13 +279,13 @@ static int __init vesafb_probe(struct de
 
 	info = framebuffer_alloc(sizeof(u32) * 256, &dev->dev);
 	if (!info) {
-		release_mem_region(vesafb_fix.smem_start, vesafb_fix.smem_len);
+		release_mem_region(vesafb_fix.smem_start, size_total);
 		return -ENOMEM;
 	}
 	info->pseudo_palette = info->par;
 	info->par = NULL;
 
-        info->screen_base = ioremap(vesafb_fix.smem_start, vesafb_fix.smem_len);
+	info->screen_base = ioremap(vesafb_fix.smem_start, vesafb_fix.smem_len);
 	if (!info->screen_base) {
 		printk(KERN_ERR
 		       "vesafb: abort, cannot ioremap video memory 0x%x @ 0x%lx\n",
@@ -386,7 +386,7 @@ static int __init vesafb_probe(struct de
 	request_region(0x3c0, 32, "vesafb");
 
 	if (mtrr) {
-		int temp_size = size_total;
+		unsigned int temp_size = size_total;
 		/* Find the largest power-of-two */
 		while (temp_size & (temp_size - 1))
                 	temp_size &= (temp_size - 1);

-- 
-mm seems unusually stable at present.
	-- akpm about 2.6.12-rc3-mm3
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/