---

yaml --- r: 271235 b: refs/heads/master c: c2d340a h: refs/heads/master i: 271233: dcdbc09 271231: fd88368 v: v3
git-mirror · Jun 15, 2011 · 05aab70 · 05aab70
1 parent 1300c14
commit 05aab70
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: c12665ffcf4e5e67b84771d30fb76dd9ff16600e
+refs/heads/master: c2d340a403f08e57fb76e738e691fe466a38a8c8
diff --git a/trunk/drivers/video/gxt4500.c b/trunk/drivers/video/gxt4500.c
@@ -543,8 +543,8 @@ static int gxt4500_pan_display(struct fb_var_screeninfo *var,
 
 	if (var->xoffset & 7)
 		return -EINVAL;
-	if (var->xoffset + var->xres > var->xres_virtual ||
-	    var->yoffset + var->yres > var->yres_virtual)
+	if (var->xoffset + info->var.xres > info->var.xres_virtual ||
+	    var->yoffset + info->var.yres > info->var.yres_virtual)
 		return -EINVAL;
 
 	writereg(par, REFRESH_START, (var->xoffset << 16) | var->yoffset);