From bed4ee3aa5f04760d8e3a20096ee0dd0888b08e2 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Tue, 14 Jun 2011 09:24:58 +0000
Subject: [PATCH] --- yaml --- r: 271229 b: refs/heads/master c:
 a4aadc9311ed8459471a1d4580d3199230a88437 h: refs/heads/master i:   271227:
 637c597c47fc2826845323cbdab3e58757149e8e v: v3

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

diff --git a/[refs] b/[refs]
index 92de07ccd917..8a4a25deff42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1bb7010d494d3fcde3814d7a8ac609f1dff96ee
+refs/heads/master: a4aadc9311ed8459471a1d4580d3199230a88437
diff --git a/trunk/drivers/video/s3fb.c b/trunk/drivers/video/s3fb.c
index 4ca5d0c8fe84..0f9af1aa5077 100644
--- a/trunk/drivers/video/s3fb.c
+++ b/trunk/drivers/video/s3fb.c
@@ -1019,12 +1019,13 @@ static int s3fb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
 	unsigned int offset;
 
 	/* Calculate the offset */
-	if (var->bits_per_pixel == 0) {
-		offset = (var->yoffset / 16) * (var->xres_virtual / 2) + (var->xoffset / 2);
+	if (info->var.bits_per_pixel == 0) {
+		offset = (var->yoffset / 16) * (info->var.xres_virtual / 2)
+		       + (var->xoffset / 2);
 		offset = offset >> 2;
 	} else {
 		offset = (var->yoffset * info->fix.line_length) +
-			 (var->xoffset * var->bits_per_pixel / 8);
+			 (var->xoffset * info->var.bits_per_pixel / 8);
 		offset = offset >> 2;
 	}