kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

staging/xgifb: Remove always false comparisons

Browse source 
This patch removes some comparisons that always evaluate to false since
xoffset and yoffset are defined as __u32 in fb_var_screeninfo in
include/linux/fb.h and thus can never be negative.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peter Huewe 2013-02-03 22:54:31 +01:00 committed by Greg Kroah-Hartman
parent f2c22605c5
commit 44e1312c68
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/staging/xgifb/XGI_main_26.c
View file

@ -1333,12 +1333,6 @@ static int XGIfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
/* Adapt RGB settings */ /* Adapt RGB settings */
XGIfb_bpp_to_var(xgifb_info, var); XGIfb_bpp_to_var(xgifb_info, var);
/* Sanity check for offsets */
if (var->xoffset < 0)
var->xoffset = 0;
if (var->yoffset < 0)
var->yoffset = 0;
if (!XGIfb_ypan) { if (!XGIfb_ypan) {
if (var->xres != var->xres_virtual) if (var->xres != var->xres_virtual)
var->xres_virtual = var->xres; var->xres_virtual = var->xres;
@ -1373,8 +1367,7 @@ static int XGIfb_pan_display(struct fb_var_screeninfo *var,
return -EINVAL; return -EINVAL;
if (var->vmode & FB_VMODE_YWRAP) { if (var->vmode & FB_VMODE_YWRAP) {
if (var->yoffset < 0 || var->yoffset >= info->var.yres_virtual if (var->yoffset >= info->var.yres_virtual || var->xoffset)
|| var->xoffset)
return -EINVAL; return -EINVAL;
} else if (var->xoffset + info->var.xres > info->var.xres_virtual } else if (var->xoffset + info->var.xres > info->var.xres_virtual
|| var->yoffset + info->var.yres || var->yoffset + info->var.yres