3 files changed, 16 insertions, 11 deletions

diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c
index 3d04b2def0f1..789450bb0bc9 100644
--- a/drivers/video/au1100fb.c
+++ b/drivers/video/au1100fb.c
@@ -214,10 +214,13 @@ int au1100fb_setmode(struct au1100fb_device *fbdev)
  */
 int au1100fb_fb_setcolreg(unsigned regno, unsigned red, unsigned green, unsigned blue, unsigned transp, struct fb_info *fbi)
 {
-        struct au1100fb_device *fbdev = to_au1100fb_device(fbi);
-        u32 *palette = fbdev->regs->lcd_pallettebase;
+        struct au1100fb_device *fbdev;
+        u32 *palette;
         u32 value;
 
+        fbdev = to_au1100fb_device(fbi);
+        palette = fbdev->regs->lcd_pallettebase;
+
         if (regno > (AU1100_LCD_NBR_PALETTE_ENTRIES - 1))
                 return -EINVAL;
 
@@ -316,9 +319,11 @@ int au1100fb_fb_blank(int blank_mode, struct fb_info *fbi)
  */
 int au1100fb_fb_pan_display(struct fb_var_screeninfo *var, struct fb_info *fbi)
 {
-        struct au1100fb_device *fbdev = to_au1100fb_device(fbi);
+        struct au1100fb_device *fbdev;
         int dy;
 
+        fbdev = to_au1100fb_device(fbi);
+
         print_dbg("fb_pan_display %p %p", var, fbi);
 
         if (!var || !fbdev) {
@@ -382,10 +387,12 @@ void au1100fb_fb_rotate(struct fb_info *fbi, int angle)
  */
 int au1100fb_fb_mmap(struct fb_info *fbi, struct vm_area_struct *vma)
 {
-        struct au1100fb_device *fbdev = to_au1100fb_device(fbi);
+        struct au1100fb_device *fbdev;
         unsigned int len;
         unsigned long start=0, off;
 
+        fbdev = to_au1100fb_device(fbi);
+
         if (vma->vm_pgoff > (~0UL >> PAGE_SHIFT)) {
                 return -EINVAL;
         }
@@ -467,7 +474,7 @@ int au1100fb_drv_probe(struct device *dev)
 
         if (!request_mem_region(au1100fb_fix.mmio_start, au1100fb_fix.mmio_len,
                                 DRIVER_NAME)) {
-                print_err("fail to lock memory region at 0x%08x",
+                print_err("fail to lock memory region at 0x%08lx",
                                 au1100fb_fix.mmio_start);
                 return -EBUSY;
         }
@@ -595,13 +602,13 @@ int au1100fb_drv_remove(struct device *dev)
         return 0;
 }
 
-int au1100fb_drv_suspend(struct device *dev, u32 state, u32 level)
+int au1100fb_drv_suspend(struct device *dev, pm_message_t state)
 {
         /* TODO */
         return 0;
 }
 
-int au1100fb_drv_resume(struct device *dev, u32 level)
+int au1100fb_drv_resume(struct device *dev)
 {
         /* TODO */
         return 0;
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index ca020719d20b..953eb8c171d6 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -2631,7 +2631,7 @@ static int fbcon_scrolldelta(struct vc_data *vc, int lines)
                                         scr_memcpyw((u16 *) q, (u16 *) p,
                                                     vc->vc_size_row);
                                 }
-                                softback_in = p;
+                                softback_in = softback_curr = p;
                                 update_region(vc, vc->vc_origin,
                                               logo_lines * vc->vc_cols);
                         }
diff --git a/drivers/video/maxinefb.c b/drivers/video/maxinefb.c
index 743e7ad26acc..f85421bf7cb5 100644
--- a/drivers/video/maxinefb.c
+++ b/drivers/video/maxinefb.c
@@ -55,7 +55,7 @@ static struct fb_var_screeninfo maxinefb_defined = {
 };
 
 static struct fb_fix_screeninfo maxinefb_fix = {
-        .id =           "Maxine onboard graphics 1024x768x8",
+        .id =           "Maxine",
         .smem_len =     (1024*768),
         .type =         FB_TYPE_PACKED_PIXELS,
         .visual =       FB_VISUAL_PSEUDOCOLOR,
@@ -107,8 +107,6 @@ static int maxinefb_setcolreg(unsigned regno, unsigned red, unsigned green,
 
 static struct fb_ops maxinefb_ops = {
         .owner          = THIS_MODULE,
-        .fb_get_fix     = gen_get_fix,
-        .fb_get_var     = gen_get_var,
         .fb_setcolreg   = maxinefb_setcolreg,
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,