---

yaml --- r: 271236 b: refs/heads/master c: df9306d h: refs/heads/master v: v3
git-mirror · Jun 15, 2011 · 16ee6e3 · 16ee6e3
1 parent 05aab70
commit 16ee6e3
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: c2d340a403f08e57fb76e738e691fe466a38a8c8
+refs/heads/master: df9306de45529f02d18a1a16b8685ef5c90f98f7
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);