summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAntonino A. Daplas <adaplas@gmail.com>2006-01-10 05:53:19 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-10 17:01:47 +0100
commitc49a2bf7993c38b452017e729646e86815b7a51d (patch)
treeed4be8787e99700653cb7f16e0d5cf6865bdcc9b /drivers
parent[PATCH] Fix vesafb display panning regression (diff)
downloadlinux-c49a2bf7993c38b452017e729646e86815b7a51d.tar.xz
linux-c49a2bf7993c38b452017e729646e86815b7a51d.zip
[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>
Diffstat (limited to 'drivers')
-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,
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;
}