---

yaml --- r: 271206 b: refs/heads/master c: 01cba94 h: refs/heads/master v: v3
git-mirror · Aug 19, 2011 · 84e0406 · 84e0406
1 parent e8bd023
commit 84e0406
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: 3bb8c31dea4f4fe41c954e1a02ac3cdd8ee6747f
+refs/heads/master: 01cba946e38eaa7071fd6fc756eedeecfcec3dd6
diff --git a/trunk/drivers/video/pm3fb.c b/trunk/drivers/video/pm3fb.c
@@ -1147,9 +1147,9 @@ static int pm3fb_pan_display(struct fb_var_screeninfo *var,
 				 struct fb_info *info)
 {
 	struct pm3_par *par = info->par;
-	const u32 xres = (var->xres + 31) & ~31;
+	const u32 xres = (info->var.xres + 31) & ~31;
 
-	par->base = pm3fb_shift_bpp(var->bits_per_pixel,
+	par->base = pm3fb_shift_bpp(info->var.bits_per_pixel,
 					(var->yoffset * xres)
 					+ var->xoffset);
 	PM3_WAIT(par, 1);