---

yaml --- r: 271205 b: refs/heads/master c: 3bb8c31 h: refs/heads/master i: 271203: 977afdd v: v3
git-mirror · Aug 19, 2011 · e8bd023 · e8bd023
1 parent 43d3516
commit e8bd023
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4935ebf43cedadcaffa56cd59449c8b6dda6d507
+refs/heads/master: 3bb8c31dea4f4fe41c954e1a02ac3cdd8ee6747f
diff --git a/trunk/drivers/video/pm2fb.c b/trunk/drivers/video/pm2fb.c
@@ -973,8 +973,8 @@ static int pm2fb_pan_display(struct fb_var_screeninfo *var,
 {
 	struct pm2fb_par *p = info->par;
 	u32 base;
-	u32 depth = (var->bits_per_pixel + 7) & ~7;
-	u32 xres = (var->xres + 31) & ~31;
+	u32 depth = (info->var.bits_per_pixel + 7) & ~7;
+	u32 xres = (info->var.xres + 31) & ~31;
 
 	depth = (depth > 32) ? 32 : depth;
 	base = to3264(var->yoffset * xres + var->xoffset, depth, 1);