---

yaml --- r: 271245 b: refs/heads/master c: 1dbe851 h: refs/heads/master i: 271243: 28c2c7d v: v3
git-mirror · Jun 15, 2011 · 66de233 · 66de233
1 parent b3a45a1
commit 66de233
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: 1fdb518f9f9c804d78e84a54ce1814fe9003bca4
+refs/heads/master: 1dbe8514fdb9ec6c82aa295c57886dfcf17574f1
diff --git a/trunk/drivers/video/acornfb.c b/trunk/drivers/video/acornfb.c
@@ -850,9 +850,9 @@ acornfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
 	u_int y_bottom = var->yoffset;
 
 	if (!(var->vmode & FB_VMODE_YWRAP))
-		y_bottom += var->yres;
+		y_bottom += info->var.yres;
 
-	if (y_bottom > var->yres_virtual)
+	if (y_bottom > info->var.yres_virtual)
 		return -EINVAL;
 
 	acornfb_update_dma(info, var);