Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44e1312c authored by Peter Huewe's avatar Peter Huewe Committed by Greg Kroah-Hartman
Browse files

staging/xgifb: Remove always false comparisons 



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: default avatarPeter Huewe <peterhuewe@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f2c22605

drivers/staging/xgifb/XGI_main_26.c

+1 −8
Original line number Original line Diff line number Diff line
@@ -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