---

yaml --- r: 271229 b: refs/heads/master c: a4aadc9 h: refs/heads/master i: 271227: 637c597 v: v3
git-mirror · Jun 15, 2011 · bed4ee3 · bed4ee3
1 parent e932ace
commit bed4ee3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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;
 	}