---

yaml --- r: 271213 b: refs/heads/master c: 2883ceb h: refs/heads/master i: 271211: 3ee2f2f v: v3
git-mirror · Aug 19, 2011 · 79a454c · 79a454c
1 parent 4888bae
commit 79a454c
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: 4541dbe154c0703cf47c43389b3544884f5f3522
+refs/heads/master: 2883cebabbc4efc00408024d284a0230ad3af8a0
diff --git a/trunk/drivers/video/vfb.c b/trunk/drivers/video/vfb.c
@@ -395,8 +395,8 @@ static int vfb_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)
 			return -EINVAL;
 	}
 	info->var.xoffset = var->xoffset;