From 147a83cb5af25d077d59b53c66ddb595412c1148 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Wed, 25 May 2011 11:34:52 +0200
Subject: [PATCH] --- yaml --- r: 271191 b: refs/heads/master c:
 2970840c034838d717126fbec0b38029c7f04852 h: refs/heads/master i:   271189:
 39979fb130eb693db029091049ae865c1195b779   271187:
 4ca90dafb0765f5be696a79deb1e1c02d1d9a603   271183:
 8f43c8ea0db2c494ef74d9ca209ffae81dc26ebd v: v3

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

diff --git a/[refs] b/[refs]
index 5256c59861db..fe5f173a2569 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3846e93a65b1a127f59203606c0e92dd22f08782
+refs/heads/master: 2970840c034838d717126fbec0b38029c7f04852
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);