]> Pileus Git - ~andy/linux/commitdiff
staging/xgifb: Remove always false comparisons
authorPeter Huewe <peterhuewe@gmx.de>
Sun, 3 Feb 2013 21:54:31 +0000 (22:54 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 4 Feb 2013 18:46:27 +0000 (10:46 -0800)
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>
drivers/staging/xgifb/XGI_main_26.c

index ca9f583387287601be846dae2866db503fc70c78..83f8a6a662c0ea88eccf73fb0dd213dab4af7a6b 100644 (file)
@@ -1333,12 +1333,6 @@ static int XGIfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
        /* Adapt RGB settings */
        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 (var->xres != var->xres_virtual)
                        var->xres_virtual = var->xres;
@@ -1373,8 +1367,7 @@ static int XGIfb_pan_display(struct fb_var_screeninfo *var,
                return -EINVAL;
 
        if (var->vmode & FB_VMODE_YWRAP) {
-               if (var->yoffset < 0 || var->yoffset >= info->var.yres_virtual
-                               || var->xoffset)
+               if (var->yoffset >= info->var.yres_virtual || var->xoffset)
                        return -EINVAL;
        } else if (var->xoffset + info->var.xres > info->var.xres_virtual
                                || var->yoffset + info->var.yres