From 66de23338433cc3b049863251b9fff5ca2bc7cb1 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Tue, 14 Jun 2011 09:24:41 +0000
Subject: [PATCH] --- yaml --- r: 271245 b: refs/heads/master c:
 1dbe8514fdb9ec6c82aa295c57886dfcf17574f1 h: refs/heads/master i:   271243:
 28c2c7d348711b352b9ad1bebfc0f655e39c0056 v: v3

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

diff --git a/[refs] b/[refs]
index f8b8933dca21..ee707569b463 100644
--- 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
index 3bacc1290548..b303f1715065 100644
--- 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);