Skip to content

Commit

Permalink
tdfxfb: remove ypan checks done by a higher layer
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Krzysztof Helt authored and Linus Torvalds committed Jul 24, 2008
1 parent 9821937 commit c2c1215
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions drivers/video/tdfxfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit c2c1215

Please sign in to comment.