From 9767e5dcb70115de034848a059c13e8bd446fd50 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Fri, 14 May 2004 20:17:56 -0700 Subject: [PATCH] [PATCH] fbdev: Vesa Fbdev update fix From: Geert Uytterhoeven On Sun, 25 Apr 2004, James Simmons wrote: > This patch migrates the Vesa Framebuffer driver over to the > framebuffer_alloc/framebuffer_release api. It also fixes the error > handling paths. The mtrr issue that Geert brought up has been fixed. > With your approval Geert, Ben please apply this patch. > + /* Set video size according to vram boot option */ > + if (vram && vram * 1024 * 1024 != vesafb_fix.smem_len) > + vesafb_fix.smem_len = vram * 1024 * 1024; The second part of the test can be removed. The rest looks OK to me. --- drivers/video/vesafb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c index 4c0afc81a5f69..05c89a7e7ef16 100644 --- a/drivers/video/vesafb.c +++ b/drivers/video/vesafb.c @@ -238,7 +238,7 @@ static int __init vesafb_probe(struct device *device) vesafb_fix.smem_len = screen_info.lfb_size * 65536; /* Set video size according to vram boot option */ - if (vram && vram * 1024 * 1024 != vesafb_fix.smem_len) + if (vram) vesafb_fix.smem_len = vram * 1024 * 1024; vesafb_fix.visual = (vesafb_defined.bits_per_pixel == 8) ? -- 2.53.0