From e7496253f261acf9766931cb31034e00f99af7ce Mon Sep 17 00:00:00 2001
From: Peter Huewe <peterhuewe@gmx.de>
Date: Sun, 3 Feb 2013 22:54:31 +0100
Subject: [PATCH] --- yaml --- r: 354351 b: refs/heads/master c:
 44e1312c68e71a25f9f88ada7d124f5bbeaf879e h: refs/heads/master i:   354349:
 74d98b62aa445e19e8e285f1331426a6ca89eede   354347:
 802575c9770241e668d2f3a23c0581816d722ab9   354343:
 4812a0792a10efedbb3805c78b24bf8519979f08   354335:
 102c541c069da51cb915c880bd3babec6203f422 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/staging/xgifb/XGI_main_26.c | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index e8c2b8fcb5a4..57f08b58ba68 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2c22605c5a12c605a7164585c96f0835e9e591c
+refs/heads/master: 44e1312c68e71a25f9f88ada7d124f5bbeaf879e
diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c
index ca9f58338728..83f8a6a662c0 100644
--- a/trunk/drivers/staging/xgifb/XGI_main_26.c
+++ b/trunk/drivers/staging/xgifb/XGI_main_26.c
@@ -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