From 6b7e15f9a1e85e3647e4df1e1b4a287b2f3fcf85 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Tue, 14 Jun 2011 09:24:51 +0000
Subject: [PATCH] --- yaml --- r: 271239 b: refs/heads/master c:
 635e9620e8361005b9a80c9fb0445b6b87d36f8c h: refs/heads/master i:   271237:
 965f6c34d5dbde9fbbbcc4f4df63107f4bec4db6   271235:
 05aab7017c1ed2d9ea21d7d3ef1f3330216ec1b9   271231:
 fd8836874adf330ea601a2827ce0170e3636cf08 v: v3

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

diff --git a/[refs] b/[refs]
index d871bd1f3694..0c71c98e2b5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 895607ec5c7d7b0d840416db6499f83a0ee187af
+refs/heads/master: 635e9620e8361005b9a80c9fb0445b6b87d36f8c
diff --git a/trunk/drivers/video/intelfb/intelfbhw.c b/trunk/drivers/video/intelfb/intelfbhw.c
index 38065cf94ac4..fbad61da359f 100644
--- a/trunk/drivers/video/intelfb/intelfbhw.c
+++ b/trunk/drivers/video/intelfb/intelfbhw.c
@@ -390,12 +390,12 @@ int intelfbhw_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
 	xoffset = ROUND_DOWN_TO(var->xoffset, 8);
 	yoffset = var->yoffset;
 
-	if ((xoffset + var->xres > var->xres_virtual) ||
-	    (yoffset + var->yres > var->yres_virtual))
+	if ((xoffset + info->var.xres > info->var.xres_virtual) ||
+	    (yoffset + info->var.yres > info->var.yres_virtual))
 		return -EINVAL;
 
 	offset = (yoffset * dinfo->pitch) +
-		 (xoffset * var->bits_per_pixel) / 8;
+		 (xoffset * info->var.bits_per_pixel) / 8;
 
 	offset += dinfo->fb.offset << 12;