From 6949bb77020f63017f5ec331606b226626ae4a2f Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Wed, 25 May 2011 11:34:52 +0200
Subject: [PATCH] --- yaml --- r: 271199 b: refs/heads/master c:
 7b116e54920ff9b8bf082fb3c371187ed075ac38 h: refs/heads/master i:   271197:
 172a7847ae7d0e7a921fbf975de702c3ba7bba5a   271195:
 0b5bdb1fb894ada337eb6dbc44b8510a197d2dc4   271191:
 147a83cb5af25d077d59b53c66ddb595412c1148   271183:
 8f43c8ea0db2c494ef74d9ca209ffae81dc26ebd   271167:
 86881ae4d7646d35aaae13919c57676dbdcb3643 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/video/hgafb.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5c57d907d32f..3836855824f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d4b695fa32b707b40fe2dab6a21a39bd91f4615
+refs/heads/master: 7b116e54920ff9b8bf082fb3c371187ed075ac38
diff --git a/trunk/drivers/video/hgafb.c b/trunk/drivers/video/hgafb.c
index 4052718eefaa..4394389caf68 100644
--- a/trunk/drivers/video/hgafb.c
+++ b/trunk/drivers/video/hgafb.c
@@ -422,8 +422,8 @@ static int hgafb_pan_display(struct fb_var_screeninfo *var,
 		    var->xoffset)
 			return -EINVAL;
 	} else {
-		if (var->xoffset + var->xres > info->var.xres_virtual
-		 || var->yoffset + var->yres > info->var.yres_virtual
+		if (var->xoffset + info->var.xres > info->var.xres_virtual
+		 || var->yoffset + info->var.yres > info->var.yres_virtual
 		 || var->yoffset % 8)
 			return -EINVAL;
 	}