---

yaml --- r: 271199 b: refs/heads/master c: 7b116e5 h: refs/heads/master i: 271197: 172a784 271195: 0b5bdb1 271191: 147a83c 271183: 8f43c8e 271167: 86881ae v: v3
git-mirror · Aug 19, 2011 · 6949bb7 · 6949bb7
1 parent 3a40583
commit 6949bb7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;
 	}