diff options
| author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2008-07-23 21:31:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 10:47:38 -0700 |
| commit | c2c12155cf05bf3e25eeae5711beffc634505400 (patch) | |
| tree | ac0709389a46985d652b5ca73a2fb1fef2f85cd7 /drivers/video/tdfxfb.c | |
| parent | 98219374d9ed2d257e56e8e1fcd9d16a083397bb (diff) | |
| download | blackbird-op-linux-c2c12155cf05bf3e25eeae5711beffc634505400.tar.gz blackbird-op-linux-c2c12155cf05bf3e25eeae5711beffc634505400.zip | |
tdfxfb: remove ypan checks done by a higher layer
These checks and assignments are done by a higher layer so remove them
from the driver.
Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/tdfxfb.c')
| -rw-r--r-- | drivers/video/tdfxfb.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c index 67664252868d..77aafcfae037 100644 --- a/drivers/video/tdfxfb.c +++ b/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; } |
