From 93284f42762ddcd64b4f3c2df90a750d277f5529 Mon Sep 17 00:00:00 2001 From: "Antonino A. Daplas" Date: Mon, 9 Jan 2006 20:53:19 -0800 Subject: [PATCH] --- yaml --- r: 17641 b: refs/heads/master c: c49a2bf7993c38b452017e729646e86815b7a51d h: refs/heads/master i: 17639: c4d0115ac896c5fdfa7b4f20ce20893744605f07 v: v3 --- [refs] | 2 +- trunk/drivers/video/vga16fb.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 8a16783ac33d..6b42c72aeda2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e53f87a02a0d77c519fb93c7aa0912956294050c +refs/heads/master: c49a2bf7993c38b452017e729646e86815b7a51d diff --git a/trunk/drivers/video/vga16fb.c b/trunk/drivers/video/vga16fb.c index 226ae8a88482..f3f16fd9f231 100644 --- a/trunk/drivers/video/vga16fb.c +++ b/trunk/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; }