aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntonino A. Daplas <adaplas@gmail.com>2006-01-09 23:53:19 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-10 11:01:47 -0500
commitc49a2bf7993c38b452017e729646e86815b7a51d (patch)
treeed4be8787e99700653cb7f16e0d5cf6865bdcc9b
parente53f87a02a0d77c519fb93c7aa0912956294050c (diff)
[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>
-rw-r--r--drivers/video/vga16fb.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c
index 226ae8a88482..f3f16fd9f231 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,
705static int vga16fb_pan_display(struct fb_var_screeninfo *var, 705static int vga16fb_pan_display(struct fb_var_screeninfo *var,
706 struct fb_info *info) 706 struct fb_info *info)
707{ 707{
708 if (var->xoffset + info->var.xres > info->var.xres_virtual ||
709 var->yoffset + info->var.yres > info->var.yres_virtual)
710 return -EINVAL;
711
712 vga16fb_pan_var(info, var); 708 vga16fb_pan_var(info, var);
713
714 info->var.xoffset = var->xoffset;
715 info->var.yoffset = var->yoffset;
716 info->var.vmode &= ~FB_VMODE_YWRAP;
717 return 0; 709 return 0;
718} 710}
719 711