From bd49e2168a4112d0a1966cf8e182ca561db91fca Mon Sep 17 00:00:00 2001 From: Krzysztof Helt Date: Wed, 23 Jul 2008 21:31:24 -0700 Subject: [PATCH] --- yaml --- r: 105538 b: refs/heads/master c: c2c12155cf05bf3e25eeae5711beffc634505400 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/tdfxfb.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index eb66034f8553..35e0817f22e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98219374d9ed2d257e56e8e1fcd9d16a083397bb +refs/heads/master: c2c12155cf05bf3e25eeae5711beffc634505400 diff --git a/trunk/drivers/video/tdfxfb.c b/trunk/drivers/video/tdfxfb.c index 67664252868d..77aafcfae037 100644 --- a/trunk/drivers/video/tdfxfb.c +++ b/trunk/drivers/video/tdfxfb.c @@ -836,16 +836,12 @@ static int tdfxfb_pan_display(struct fb_var_screeninfo *var, struct tdfx_par *par = info->par; u32 addr = var->yoffset * info->fix.line_length; - if (nopan || var->xoffset || (var->yoffset > var->yres_virtual)) - return -EINVAL; - if ((var->yoffset + var->yres > var->yres_virtual && nowrap)) + if (nopan || var->xoffset) return -EINVAL; banshee_make_room(par, 1); tdfx_outl(par, VIDDESKSTART, addr); - info->var.xoffset = var->xoffset; - info->var.yoffset = var->yoffset; return 0; }