From 1300c142f38e81fffa36bb9d5b2e9d86c020db5f Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Tue, 14 Jun 2011 09:24:50 +0000
Subject: [PATCH] --- yaml --- r: 271234 b: refs/heads/master c:
 c12665ffcf4e5e67b84771d30fb76dd9ff16600e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index df9e2a465cc9..7de73a599310 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eca7370bd2f29296126011caed64af93c2c73803
+refs/heads/master: c12665ffcf4e5e67b84771d30fb76dd9ff16600e
diff --git a/trunk/drivers/video/imsttfb.c b/trunk/drivers/video/imsttfb.c
index efb2c10656b0..8149356471e4 100644
--- a/trunk/drivers/video/imsttfb.c
+++ b/trunk/drivers/video/imsttfb.c
@@ -749,7 +749,7 @@ set_offset (struct fb_var_screeninfo *var, struct fb_info *info)
 {
 	struct imstt_par *par = info->par;
 	__u32 off = var->yoffset * (info->fix.line_length >> 3)
-		    + ((var->xoffset * (var->bits_per_pixel >> 3)) >> 3);
+		    + ((var->xoffset * (info->var.bits_per_pixel >> 3)) >> 3);
 	write_reg_le32(par->dc_regs, SSR, off);
 }