From: Antonino A. Daplas <adaplas@gmail.com>
Date: Tue, 10 Jan 2006 04:53:19 +0000 (-0800)
Subject: [PATCH] vga16fb: Trim vga16fb_pan_display
X-Git-Tag: v2.6.16-rc1~538
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c49a2bf7993c38b452017e729646e86815b7a51d;p=linux-2.6

[PATCH] vga16fb: Trim vga16fb_pan_display

Remove error checking and updating from vga16fb_pan_display.  This is
guaranteed to be done by the core layer.

Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c
index 226ae8a884..f3f16fd9f2 100644
--- a/drivers/video/vga16fb.c
+++ b/drivers/video/vga16fb.c
@@ -705,15 +705,7 @@ static int vga16fb_setcolreg(unsigned regno, unsigned red, unsigned green,
 static int vga16fb_pan_display(struct fb_var_screeninfo *var,
 			       struct fb_info *info) 
 {
-	if (var->xoffset + info->var.xres > info->var.xres_virtual ||
-	    var->yoffset + info->var.yres > info->var.yres_virtual)
-		return -EINVAL;
-
 	vga16fb_pan_var(info, var);
-
-	info->var.xoffset = var->xoffset;
-	info->var.yoffset = var->yoffset;
-	info->var.vmode &= ~FB_VMODE_YWRAP;
 	return 0;
 }