Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

19 files changed, 145 insertions, 86 deletions

diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 0ebc1bfd2514..a6b55297a7fb 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -118,7 +118,6 @@ obj-$(CONFIG_FB_PS3)		  += ps3fb.o
 obj-$(CONFIG_FB_SM501)            += sm501fb.o
 obj-$(CONFIG_FB_XILINX)           += xilinxfb.o
 obj-$(CONFIG_FB_SH_MOBILE_LCDC)   += sh_mobile_lcdcfb.o
-obj-$(CONFIG_FB_SH7343VOU)        += sh7343_voufb.o
 obj-$(CONFIG_FB_OMAP)             += omap/
 obj-$(CONFIG_XEN_FBDEV_FRONTEND)  += xen-fbfront.o
 obj-$(CONFIG_FB_CARMINE)          += carminefb.o
diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c
index 5001bd4ef466..4bd569e479a7 100644
--- a/drivers/video/arkfb.c
+++ b/drivers/video/arkfb.c
@@ -958,20 +958,20 @@ static int __devinit ark_pci_probe(struct pci_dev *dev, const struct pci_device_
         /* Prepare PCI device */
         rc = pci_enable_device(dev);
         if (rc < 0) {
-                dev_err(info->dev, "cannot enable PCI device\n");
+                dev_err(info->device, "cannot enable PCI device\n");
                 goto err_enable_device;
         }
 
         rc = pci_request_regions(dev, "arkfb");
         if (rc < 0) {
-                dev_err(info->dev, "cannot reserve framebuffer region\n");
+                dev_err(info->device, "cannot reserve framebuffer region\n");
                 goto err_request_regions;
         }
 
         par->dac = ics5342_init(ark_dac_read_regs, ark_dac_write_regs, info);
         if (! par->dac) {
                 rc = -ENOMEM;
-                dev_err(info->dev, "RAMDAC initialization failed\n");
+                dev_err(info->device, "RAMDAC initialization failed\n");
                 goto err_dac;
         }
 
@@ -982,7 +982,7 @@ static int __devinit ark_pci_probe(struct pci_dev *dev, const struct pci_device_
         info->screen_base = pci_iomap(dev, 0, 0);
         if (! info->screen_base) {
                 rc = -ENOMEM;
-                dev_err(info->dev, "iomap for framebuffer failed\n");
+                dev_err(info->device, "iomap for framebuffer failed\n");
                 goto err_iomap;
         }
 
@@ -1004,19 +1004,19 @@ static int __devinit ark_pci_probe(struct pci_dev *dev, const struct pci_device_
         rc = fb_find_mode(&(info->var), info, mode_option, NULL, 0, NULL, 8);
         if (! ((rc == 1) || (rc == 2))) {
                 rc = -EINVAL;
-                dev_err(info->dev, "mode %s not found\n", mode_option);
+                dev_err(info->device, "mode %s not found\n", mode_option);
                 goto err_find_mode;
         }
 
         rc = fb_alloc_cmap(&info->cmap, 256, 0);
         if (rc < 0) {
-                dev_err(info->dev, "cannot allocate colormap\n");
+                dev_err(info->device, "cannot allocate colormap\n");
                 goto err_alloc_cmap;
         }
 
         rc = register_framebuffer(info);
         if (rc < 0) {
-                dev_err(info->dev, "cannot register framebugger\n");
+                dev_err(info->device, "cannot register framebugger\n");
                 goto err_reg_fb;
         }
 
@@ -1090,7 +1090,7 @@ static int ark_pci_suspend (struct pci_dev* dev, pm_message_t state)
         struct fb_info *info = pci_get_drvdata(dev);
         struct arkfb_info *par = info->par;
 
-        dev_info(info->dev, "suspend\n");
+        dev_info(info->device, "suspend\n");
 
         acquire_console_sem();
         mutex_lock(&(par->open_lock));
@@ -1121,16 +1121,13 @@ static int ark_pci_resume (struct pci_dev* dev)
         struct fb_info *info = pci_get_drvdata(dev);
         struct arkfb_info *par = info->par;
 
-        dev_info(info->dev, "resume\n");
+        dev_info(info->device, "resume\n");
 
         acquire_console_sem();
         mutex_lock(&(par->open_lock));
 
-        if (par->ref_count == 0) {
-                mutex_unlock(&(par->open_lock));
-                release_console_sem();
-                return 0;
-        }
+        if (par->ref_count == 0)
+                goto fail;
 
         pci_set_power_state(dev, PCI_D0);
         pci_restore_state(dev);
@@ -1143,8 +1140,8 @@ static int ark_pci_resume (struct pci_dev* dev)
         arkfb_set_par(info);
         fb_set_suspend(info, 0);
 
-        mutex_unlock(&(par->open_lock));
 fail:
+        mutex_unlock(&(par->open_lock));
         release_console_sem();
         return 0;
 }
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 620ba8120368..cc6b470073da 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -244,7 +244,7 @@ static int atyfb_sync(struct fb_info *info);
      */
 
 static int aty_init(struct fb_info *info);
-static void aty_resume_chip(struct fb_info *info);
+
 #ifdef CONFIG_ATARI
 static int store_video_par(char *videopar, unsigned char m64_num);
 #endif
@@ -2023,6 +2023,20 @@ static int atyfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
         return 0;
 }
 
+static void aty_resume_chip(struct fb_info *info)
+{
+        struct atyfb_par *par = info->par;
+
+        aty_st_le32(MEM_CNTL, par->mem_cntl, par);
+
+        if (par->pll_ops->resume_pll)
+                par->pll_ops->resume_pll(info, &par->pll);
+
+        if (par->aux_start)
+                aty_st_le32(BUS_CNTL,
+                        aty_ld_le32(BUS_CNTL, par) | BUS_APER_REG_DIS, par);
+}
+
 static int atyfb_pci_resume(struct pci_dev *pdev)
 {
         struct fb_info *info = pci_get_drvdata(pdev);
@@ -2659,19 +2673,6 @@ aty_init_exit:
         return ret;
 }
 
-static void aty_resume_chip(struct fb_info *info)
-{
-        struct atyfb_par *par = info->par;
-
-        aty_st_le32(MEM_CNTL, par->mem_cntl, par);
-
-        if (par->pll_ops->resume_pll)
-                par->pll_ops->resume_pll(info, &par->pll);
-
-        if (par->aux_start)
-                aty_st_le32(BUS_CNTL, aty_ld_le32(BUS_CNTL, par) | BUS_APER_REG_DIS, par);
-}
-
 #ifdef CONFIG_ATARI
 static int __devinit store_video_par(char *video_str, unsigned char m64_num)
 {
diff --git a/drivers/video/aty/radeon_accel.c b/drivers/video/aty/radeon_accel.c
index 3ca27cb13caa..4d13f68436e6 100644
--- a/drivers/video/aty/radeon_accel.c
+++ b/drivers/video/aty/radeon_accel.c
@@ -241,8 +241,8 @@ void radeonfb_engine_reset(struct radeonfb_info *rinfo)
         INREG(HOST_PATH_CNTL);
         OUTREG(HOST_PATH_CNTL, host_path_cntl);
 
-        if (rinfo->family != CHIP_FAMILY_R300 ||
-            rinfo->family != CHIP_FAMILY_R350 ||
+        if (rinfo->family != CHIP_FAMILY_R300 &&
+            rinfo->family != CHIP_FAMILY_R350 &&
             rinfo->family != CHIP_FAMILY_RV350)
                 OUTREG(RBBM_SOFT_RESET, rbbm_soft_reset);
 
diff --git a/drivers/video/aty/radeon_i2c.c b/drivers/video/aty/radeon_i2c.c
index f9e7c29ad9bf..8c8fa35f1b7c 100644
--- a/drivers/video/aty/radeon_i2c.c
+++ b/drivers/video/aty/radeon_i2c.c
@@ -69,7 +69,8 @@ static int radeon_setup_i2c_bus(struct radeon_i2c_chan *chan, const char *name)
 {
         int rc;
 
-        strcpy(chan->adapter.name, name);
+        snprintf(chan->adapter.name, sizeof(chan->adapter.name),
+                 "radeonfb %s", name);
         chan->adapter.owner             = THIS_MODULE;
         chan->adapter.id                = I2C_HW_B_RADEON;
         chan->adapter.algo_data         = &chan->algo;
diff --git a/drivers/video/backlight/hp680_bl.c b/drivers/video/backlight/hp680_bl.c
index fbea2bd129c7..6fa0b9d5559a 100644
--- a/drivers/video/backlight/hp680_bl.c
+++ b/drivers/video/backlight/hp680_bl.c
@@ -18,7 +18,7 @@
 #include <linux/fb.h>
 #include <linux/backlight.h>
 
-#include <asm/cpu/dac.h>
+#include <cpu/dac.h>
 #include <asm/hp6xx.h>
 #include <asm/hd64461.h>
 
diff --git a/drivers/video/backlight/platform_lcd.c b/drivers/video/backlight/platform_lcd.c
index 72d44dbfce82..738694d23889 100644
--- a/drivers/video/backlight/platform_lcd.c
+++ b/drivers/video/backlight/platform_lcd.c
@@ -92,7 +92,7 @@ static int __devinit platform_lcd_probe(struct platform_device *pdev)
 
         plcd->us = dev;
         plcd->pdata = pdata;
-        plcd->lcd = lcd_device_register("platform-lcd", dev,
+        plcd->lcd = lcd_device_register(dev_name(dev), dev,
                                         plcd, &platform_lcd_ops);
         if (IS_ERR(plcd->lcd)) {
                 dev_err(dev, "cannot register lcd device\n");
@@ -101,6 +101,8 @@ static int __devinit platform_lcd_probe(struct platform_device *pdev)
         }
 
         platform_set_drvdata(pdev, plcd);
+        platform_lcd_set_power(plcd->lcd, FB_BLANK_NORMAL);
+
         return 0;
 
  err_mem:
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
index 6338d0e2fe07..ea07258565f0 100644
--- a/drivers/video/backlight/pwm_bl.c
+++ b/drivers/video/backlight/pwm_bl.c
@@ -68,8 +68,10 @@ static int pwm_backlight_probe(struct platform_device *pdev)
         struct pwm_bl_data *pb;
         int ret;
 
-        if (!data)
+        if (!data) {
+                dev_err(&pdev->dev, "failed to find platform data\n");
                 return -EINVAL;
+        }
 
         if (data->init) {
                 ret = data->init(&pdev->dev);
@@ -79,6 +81,7 @@ static int pwm_backlight_probe(struct platform_device *pdev)
 
         pb = kzalloc(sizeof(*pb), GFP_KERNEL);
         if (!pb) {
+                dev_err(&pdev->dev, "no memory for state\n");
                 ret = -ENOMEM;
                 goto err_alloc;
         }
@@ -91,7 +94,8 @@ static int pwm_backlight_probe(struct platform_device *pdev)
                 dev_err(&pdev->dev, "unable to request PWM for backlight\n");
                 ret = PTR_ERR(pb->pwm);
                 goto err_pwm;
-        }
+        } else
+                dev_dbg(&pdev->dev, "got pwm for backlight\n");
 
         bl = backlight_device_register(pdev->name, &pdev->dev,
                         pb, &pwm_backlight_ops);
@@ -183,3 +187,5 @@ module_exit(pwm_backlight_exit);
 
 MODULE_DESCRIPTION("PWM based Backlight Driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:pwm-backlight");
+
diff --git a/drivers/video/console/.gitignore b/drivers/video/console/.gitignore
new file mode 100644
index 000000000000..0c258b45439c
--- /dev/null
+++ b/drivers/video/console/.gitignore
@@ -0,0 +1,2 @@
+# conmakehash generated file
+promcon_tbl.c
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 3ccfa76d9b2a..33859934a8e4 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -1311,6 +1311,9 @@ static void fbcon_clear(struct vc_data *vc, int sy, int sx, int height,
         if (!height || !width)
                 return;
 
+        if (sy < vc->vc_top && vc->vc_top == logo_lines)
+                vc->vc_top = 0;
+
         /* Split blits that cross physical y_wrap boundary */
 
         y_break = p->vrows - p->yscroll;
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c
index d7822af0e00a..ef7870f5ea08 100644
--- a/drivers/video/console/sticore.c
+++ b/drivers/video/console/sticore.c
@@ -24,6 +24,7 @@
 #include <asm/hardware.h>
 #include <asm/parisc-device.h>
 #include <asm/cacheflush.h>
+#include <asm/grfioctl.h>
 
 #include "../sticore.h"
 
@@ -725,6 +726,7 @@ static int __devinit sti_read_rom(int wordmode, struct sti_struct *sti,
 {
         struct sti_cooked_rom *cooked;
         struct sti_rom *raw = NULL;
+        unsigned long revno;
 
         cooked = kmalloc(sizeof *cooked, GFP_KERNEL);
         if (!cooked)
@@ -767,9 +769,35 @@ static int __devinit sti_read_rom(int wordmode, struct sti_struct *sti,
         sti->graphics_id[1] = raw->graphics_id[1];
         
         sti_dump_rom(raw);
-        
+
+        /* check if the ROM routines in this card are compatible */
+        if (wordmode || sti->graphics_id[1] != 0x09A02587)
+                goto ok;
+
+        revno = (raw->revno[0] << 8) | raw->revno[1];
+
+        switch (sti->graphics_id[0]) {
+        case S9000_ID_HCRX:
+                /* HyperA or HyperB ? */
+                if (revno == 0x8408 || revno == 0x840b)
+                        goto msg_not_supported;
+                break;
+        case CRT_ID_THUNDER:
+                if (revno == 0x8509)
+                        goto msg_not_supported;
+                break;
+        case CRT_ID_THUNDER2:
+                if (revno == 0x850c)
+                        goto msg_not_supported;
+        }
+ok:
         return 1;
 
+msg_not_supported:
+        printk(KERN_ERR "Sorry, this GSC/STI card is not yet supported.\n");
+        printk(KERN_ERR "Please see http://parisc-linux.org/faq/"
+                        "graphics-howto.html for more info.\n");
+        /* fall through */
 out_err:
         kfree(raw);
         kfree(cooked);
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index 9cd36c223d33..bd320a2bfb7c 100644
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -1649,8 +1649,10 @@ static int __init fsl_diu_init(void)
         }
 
         prop = of_get_property(np, "d-cache-size", NULL);
-        if (prop == NULL)
+        if (prop == NULL) {
+                of_node_put(np);
                 return -ENODEV;
+        }
 
         /* Freescale PLRU requires 13/8 times the cache size to do a proper
            displacement flush
@@ -1659,8 +1661,10 @@ static int __init fsl_diu_init(void)
         coherence_data_size /= 8;
 
         prop = of_get_property(np, "d-cache-line-size", NULL);
-        if (prop == NULL)
+        if (prop == NULL) {
+                of_node_put(np);
                 return -ENODEV;
+        }
         d_cache_line_size = *prop;
 
         of_node_put(np);
diff --git a/drivers/video/gbefb.c b/drivers/video/gbefb.c
index 2e552d5bbb5d..f89c3cce1e0c 100644
--- a/drivers/video/gbefb.c
+++ b/drivers/video/gbefb.c
@@ -87,6 +87,8 @@ static int gbe_revision;
 static int ypan, ywrap;
 
 static uint32_t pseudo_palette[16];
+static uint32_t gbe_cmap[256];
+static int gbe_turned_on; /* 0 turned off, 1 turned on */
 
 static char *mode_option __initdata = NULL;
 
@@ -208,6 +210,8 @@ void gbe_turn_off(void)
         int i;
         unsigned int val, x, y, vpixen_off;
 
+        gbe_turned_on = 0;
+
         /* check if pixel counter is on */
         val = gbe->vt_xy;
         if (GET_GBE_FIELD(VT_XY, FREEZE, val) == 1)
@@ -371,6 +375,22 @@ static void gbe_turn_on(void)
         }
         if (i == 10000)
                 printk(KERN_ERR "gbefb: turn on DMA timed out\n");
+
+        gbe_turned_on = 1;
+}
+
+static void gbe_loadcmap(void)
+{
+        int i, j;
+
+        for (i = 0; i < 256; i++) {
+                for (j = 0; j < 1000 && gbe->cm_fifo >= 63; j++)
+                        udelay(10);
+                if (j == 1000)
+                        printk(KERN_ERR "gbefb: cmap FIFO timeout\n");
+
+                gbe->cmap[i] = gbe_cmap[i];
+        }
 }
 
 /*
@@ -382,6 +402,7 @@ static int gbefb_blank(int blank, struct fb_info *info)
         switch (blank) {
         case FB_BLANK_UNBLANK:          /* unblank */
                 gbe_turn_on();
+                gbe_loadcmap();
                 break;
 
         case FB_BLANK_NORMAL:           /* blank */
@@ -796,16 +817,10 @@ static int gbefb_set_par(struct fb_info *info)
                 gbe->gmap[i] = (i << 24) | (i << 16) | (i << 8);
 
         /* Initialize the color map */
-        for (i = 0; i < 256; i++) {
-                int j;
-
-                for (j = 0; j < 1000 && gbe->cm_fifo >= 63; j++)
-                        udelay(10);
-                if (j == 1000)
-                        printk(KERN_ERR "gbefb: cmap FIFO timeout\n");
+        for (i = 0; i < 256; i++)
+                gbe_cmap[i] = (i << 8) | (i << 16) | (i << 24);
 
-                gbe->cmap[i] = (i << 8) | (i << 16) | (i << 24);
-        }
+        gbe_loadcmap();
 
         return 0;
 }
@@ -855,14 +870,17 @@ static int gbefb_setcolreg(unsigned regno, unsigned red, unsigned green,
         blue >>= 8;
 
         if (info->var.bits_per_pixel <= 8) {
-                /* wait for the color map FIFO to have a free entry */
-                for (i = 0; i < 1000 && gbe->cm_fifo >= 63; i++)
-                        udelay(10);
-                if (i == 1000) {
-                        printk(KERN_ERR "gbefb: cmap FIFO timeout\n");
-                        return 1;
+                gbe_cmap[regno] = (red << 24) | (green << 16) | (blue << 8);
+                if (gbe_turned_on) {
+                        /* wait for the color map FIFO to have a free entry */
+                        for (i = 0; i < 1000 && gbe->cm_fifo >= 63; i++)
+                                udelay(10);
+                        if (i == 1000) {
+                                printk(KERN_ERR "gbefb: cmap FIFO timeout\n");
+                                return 1;
+                        }
+                        gbe->cmap[regno] = gbe_cmap[regno];
                 }
-                gbe->cmap[regno] = (red << 24) | (green << 16) | (blue << 8);
         } else if (regno < 16) {
                 switch (info->var.bits_per_pixel) {
                 case 15:
diff --git a/drivers/video/hitfb.c b/drivers/video/hitfb.c
index 392a8be6aa76..e6467cf9f19f 100644
--- a/drivers/video/hitfb.c
+++ b/drivers/video/hitfb.c
@@ -27,7 +27,7 @@
 #include <asm/pgtable.h>
 #include <asm/io.h>
 #include <asm/hd64461.h>
-#include <asm/cpu/dac.h>
+#include <cpu/dac.h>
 
 #define WIDTH 640
 
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index 54e82f35353d..c02136202792 100644
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -2536,7 +2536,7 @@ module_param(fh, int, 0);
 MODULE_PARM_DESC(fh, "Startup horizontal frequency, 0-999kHz, 1000-INF Hz");
 module_param(fv, int, 0);
 MODULE_PARM_DESC(fv, "Startup vertical frequency, 0-INF Hz\n"
-"You should specify \"fv:max_monitor_vsync,fh:max_monitor_hsync,maxclk:max_monitor_dotclock\"\n");
+"You should specify \"fv:max_monitor_vsync,fh:max_monitor_hsync,maxclk:max_monitor_dotclock\"");
 module_param(grayscale, int, 0);
 MODULE_PARM_DESC(grayscale, "Sets display into grayscale. Works perfectly with paletized videomode (4, 8bpp), some limitations apply to 16, 24 and 32bpp videomodes (default=nograyscale)");
 module_param(cross4MB, int, 0);
diff --git a/drivers/video/pvr2fb.c b/drivers/video/pvr2fb.c
index 8c863a7f654b..0a0fd48a8566 100644
--- a/drivers/video/pvr2fb.c
+++ b/drivers/video/pvr2fb.c
@@ -58,18 +58,18 @@
 
 #ifdef CONFIG_SH_DREAMCAST
 #include <asm/machvec.h>
-#include <asm/mach/sysasic.h>
+#include <mach-dreamcast/mach/sysasic.h>
 #endif
 
 #ifdef CONFIG_SH_DMA
 #include <linux/pagemap.h>
-#include <asm/mach/dma.h>
+#include <mach/dma.h>
 #include <asm/dma.h>
 #endif
 
 #ifdef CONFIG_SH_STORE_QUEUES
 #include <linux/uaccess.h>
-#include <asm/cpu/sq.h>
+#include <cpu/sq.h>
 #endif
 
 #ifndef PCI_DEVICE_ID_NEC_NEON250
diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c
index 2972f112dbed..8361bd0e3df1 100644
--- a/drivers/video/s3fb.c
+++ b/drivers/video/s3fb.c
@@ -903,13 +903,13 @@ static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_i
         /* Prepare PCI device */
         rc = pci_enable_device(dev);
         if (rc < 0) {
-                dev_err(info->dev, "cannot enable PCI device\n");
+                dev_err(info->device, "cannot enable PCI device\n");
                 goto err_enable_device;
         }
 
         rc = pci_request_regions(dev, "s3fb");
         if (rc < 0) {
-                dev_err(info->dev, "cannot reserve framebuffer region\n");
+                dev_err(info->device, "cannot reserve framebuffer region\n");
                 goto err_request_regions;
         }
 
@@ -921,7 +921,7 @@ static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_i
         info->screen_base = pci_iomap(dev, 0, 0);
         if (! info->screen_base) {
                 rc = -ENOMEM;
-                dev_err(info->dev, "iomap for framebuffer failed\n");
+                dev_err(info->device, "iomap for framebuffer failed\n");
                 goto err_iomap;
         }
 
@@ -965,19 +965,19 @@ static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_i
         rc = fb_find_mode(&(info->var), info, mode_option, NULL, 0, NULL, 8);
         if (! ((rc == 1) || (rc == 2))) {
                 rc = -EINVAL;
-                dev_err(info->dev, "mode %s not found\n", mode_option);
+                dev_err(info->device, "mode %s not found\n", mode_option);
                 goto err_find_mode;
         }
 
         rc = fb_alloc_cmap(&info->cmap, 256, 0);
         if (rc < 0) {
-                dev_err(info->dev, "cannot allocate colormap\n");
+                dev_err(info->device, "cannot allocate colormap\n");
                 goto err_alloc_cmap;
         }
 
         rc = register_framebuffer(info);
         if (rc < 0) {
-                dev_err(info->dev, "cannot register framebuffer\n");
+                dev_err(info->device, "cannot register framebuffer\n");
                 goto err_reg_fb;
         }
 
@@ -1053,7 +1053,7 @@ static int s3_pci_suspend(struct pci_dev* dev, pm_message_t state)
         struct fb_info *info = pci_get_drvdata(dev);
         struct s3fb_info *par = info->par;
 
-        dev_info(info->dev, "suspend\n");
+        dev_info(info->device, "suspend\n");
 
         acquire_console_sem();
         mutex_lock(&(par->open_lock));
@@ -1085,7 +1085,7 @@ static int s3_pci_resume(struct pci_dev* dev)
         struct s3fb_info *par = info->par;
         int err;
 
-        dev_info(info->dev, "resume\n");
+        dev_info(info->device, "resume\n");
 
         acquire_console_sem();
         mutex_lock(&(par->open_lock));
@@ -1102,7 +1102,7 @@ static int s3_pci_resume(struct pci_dev* dev)
         if (err) {
                 mutex_unlock(&(par->open_lock));
                 release_console_sem();
-                dev_err(info->dev, "error %d enabling device for resume\n", err);
+                dev_err(info->device, "error %d enabling device for resume\n", err);
                 return err;
         }
         pci_set_master(dev);
diff --git a/drivers/video/sh7760fb.c b/drivers/video/sh7760fb.c
index 4d0e28c5790b..8d0212da4514 100644
--- a/drivers/video/sh7760fb.c
+++ b/drivers/video/sh7760fb.c
@@ -152,6 +152,7 @@ static int sh7760fb_setcmap(struct fb_cmap *cmap, struct fb_info *info)
                 col |= ((*g) & 0xff) << 8;
                 col |= ((*b) & 0xff);
                 col &= SH7760FB_PALETTE_MASK;
+                iowrite32(col, par->base + LDPR(s));
 
                 if (s < 16)
                         ((u32 *) (info->pseudo_palette))[s] = s;
diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c
index 536ab11623f0..34aae7a2a62b 100644
--- a/drivers/video/vt8623fb.c
+++ b/drivers/video/vt8623fb.c
@@ -677,13 +677,13 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi
 
         rc = pci_enable_device(dev);
         if (rc < 0) {
-                dev_err(info->dev, "cannot enable PCI device\n");
+                dev_err(info->device, "cannot enable PCI device\n");
                 goto err_enable_device;
         }
 
         rc = pci_request_regions(dev, "vt8623fb");
         if (rc < 0) {
-                dev_err(info->dev, "cannot reserve framebuffer region\n");
+                dev_err(info->device, "cannot reserve framebuffer region\n");
                 goto err_request_regions;
         }
 
@@ -696,14 +696,14 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi
         info->screen_base = pci_iomap(dev, 0, 0);
         if (! info->screen_base) {
                 rc = -ENOMEM;
-                dev_err(info->dev, "iomap for framebuffer failed\n");
+                dev_err(info->device, "iomap for framebuffer failed\n");
                 goto err_iomap_1;
         }
 
         par->mmio_base = pci_iomap(dev, 1, 0);
         if (! par->mmio_base) {
                 rc = -ENOMEM;
-                dev_err(info->dev, "iomap for MMIO failed\n");
+                dev_err(info->device, "iomap for MMIO failed\n");
                 goto err_iomap_2;
         }
 
@@ -714,7 +714,7 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi
         if ((16 <= memsize1) && (memsize1 <= 64) && (memsize1 == memsize2))
                 info->screen_size = memsize1 << 20;
         else {
-                dev_err(info->dev, "memory size detection failed (%x %x), suppose 16 MB\n", memsize1, memsize2);
+                dev_err(info->device, "memory size detection failed (%x %x), suppose 16 MB\n", memsize1, memsize2);
                 info->screen_size = 16 << 20;
         }
 
@@ -731,19 +731,19 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi
         rc = fb_find_mode(&(info->var), info, mode_option, NULL, 0, NULL, 8);
         if (! ((rc == 1) || (rc == 2))) {
                 rc = -EINVAL;
-                dev_err(info->dev, "mode %s not found\n", mode_option);
+                dev_err(info->device, "mode %s not found\n", mode_option);
                 goto err_find_mode;
         }
 
         rc = fb_alloc_cmap(&info->cmap, 256, 0);
         if (rc < 0) {
-                dev_err(info->dev, "cannot allocate colormap\n");
+                dev_err(info->device, "cannot allocate colormap\n");
                 goto err_alloc_cmap;
         }
 
         rc = register_framebuffer(info);
         if (rc < 0) {
-                dev_err(info->dev, "cannot register framebugger\n");
+                dev_err(info->device, "cannot register framebugger\n");
                 goto err_reg_fb;
         }
 
@@ -817,7 +817,7 @@ static int vt8623_pci_suspend(struct pci_dev* dev, pm_message_t state)
         struct fb_info *info = pci_get_drvdata(dev);
         struct vt8623fb_info *par = info->par;
 
-        dev_info(info->dev, "suspend\n");
+        dev_info(info->device, "suspend\n");
 
         acquire_console_sem();
         mutex_lock(&(par->open_lock));
@@ -848,16 +848,13 @@ static int vt8623_pci_resume(struct pci_dev* dev)
         struct fb_info *info = pci_get_drvdata(dev);
         struct vt8623fb_info *par = info->par;
 
-        dev_info(info->dev, "resume\n");
+        dev_info(info->device, "resume\n");
 
         acquire_console_sem();
         mutex_lock(&(par->open_lock));
 
-        if (par->ref_count == 0) {
-                mutex_unlock(&(par->open_lock));
-                release_console_sem();
-                return 0;
-        }
+        if (par->ref_count == 0)
+                goto fail;
 
         pci_set_power_state(dev, PCI_D0);
         pci_restore_state(dev);
@@ -870,8 +867,8 @@ static int vt8623_pci_resume(struct pci_dev* dev)
         vt8623fb_set_par(info);
         fb_set_suspend(info, 0);
 
-        mutex_unlock(&(par->open_lock));
 fail:
+        mutex_unlock(&(par->open_lock));
         release_console_sem();
 
         return 0;