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);