From: Krzysztof Helt These checks and assignments are done by a higher layer so remove them from the driver. Signed-off-by: Krzysztof Helt Signed-off-by: Andrew Morton --- drivers/video/tdfxfb.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff -puN drivers/video/tdfxfb.c~tdfxfb-remove-ypan-checks-done-by-a-higher-layer drivers/video/tdfxfb.c --- a/drivers/video/tdfxfb.c~tdfxfb-remove-ypan-checks-done-by-a-higher-layer +++ a/drivers/video/tdfxfb.c @@ -836,16 +836,12 @@ static int tdfxfb_pan_display(struct fb_ 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; } _