18 files changed, 84 insertions, 56 deletions

diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index 243ea4ab20c8..db16112cf197 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -2051,7 +2051,7 @@ static int __devinit aty128_probe(struct pci_dev *pdev, const struct pci_device_
 
         /* Virtualize mmio region */
         info->fix.mmio_start = reg_addr;
-        par->regbase = ioremap(reg_addr, pci_resource_len(pdev, 2));
+        par->regbase = pci_ioremap_bar(pdev, 2);
         if (!par->regbase)
                 goto err_free_info;
 
diff --git a/drivers/video/bfin-t350mcqb-fb.c b/drivers/video/bfin-t350mcqb-fb.c
index 7d1b819e501c..a9b3ada05d99 100644
--- a/drivers/video/bfin-t350mcqb-fb.c
+++ b/drivers/video/bfin-t350mcqb-fb.c
@@ -255,7 +255,7 @@ static int bfin_t350mcqb_fb_check_var(struct fb_var_screeninfo *var,
 {
 
         if (var->bits_per_pixel != LCD_BPP) {
-                pr_debug("%s: depth not supported: %u BPP\n", __FUNCTION__,
+                pr_debug("%s: depth not supported: %u BPP\n", __func__,
                          var->bits_per_pixel);
                 return -EINVAL;
         }
@@ -264,7 +264,7 @@ static int bfin_t350mcqb_fb_check_var(struct fb_var_screeninfo *var,
             info->var.xres_virtual != var->xres_virtual ||
             info->var.yres_virtual != var->yres_virtual) {
                 pr_debug("%s: Resolution not supported: X%u x Y%u \n",
-                         __FUNCTION__, var->xres, var->yres);
+                         __func__, var->xres, var->yres);
                 return -EINVAL;
         }
 
@@ -274,7 +274,7 @@ static int bfin_t350mcqb_fb_check_var(struct fb_var_screeninfo *var,
 
         if ((info->fix.line_length * var->yres_virtual) > info->fix.smem_len) {
                 pr_debug("%s: Memory Limit requested yres_virtual = %u\n",
-                         __FUNCTION__, var->yres_virtual);
+                         __func__, var->yres_virtual);
                 return -ENOMEM;
         }
 
diff --git a/drivers/video/carminefb.c b/drivers/video/carminefb.c
index c9b191319a9a..c7ff3c1a266a 100644
--- a/drivers/video/carminefb.c
+++ b/drivers/video/carminefb.c
@@ -168,7 +168,7 @@ static int carmine_setcolreg(unsigned regno, unsigned red, unsigned green,
         blue >>= 8;
         transp >>= 8;
 
-        ((u32 *)info->pseudo_palette)[regno] = be32_to_cpu(transp << 24 |
+        ((__be32 *)info->pseudo_palette)[regno] = cpu_to_be32(transp << 24 |
                 red << 0 | green << 8 | blue << 16);
         return 0;
 }
diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c
index 39d5d643a50b..7a9e42e3a9a9 100644
--- a/drivers/video/cyber2000fb.c
+++ b/drivers/video/cyber2000fb.c
@@ -1583,8 +1583,7 @@ cyberpro_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
                 goto failed_release;
 
         cfb->dev = dev;
-        cfb->region = ioremap(pci_resource_start(dev, 0),
-                              pci_resource_len(dev, 0));
+        cfb->region = pci_ioremap_bar(dev, 0);
         if (!cfb->region)
                 goto failed_ioremap;
 
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 3c65b0d67617..756efeb91abc 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -510,6 +510,10 @@ static int fb_prepare_extra_logos(struct fb_info *info, unsigned int height,
                 fb_logo_ex_num = 0;
 
         for (i = 0; i < fb_logo_ex_num; i++) {
+                if (fb_logo_ex[i].logo->type != fb_logo.logo->type) {
+                        fb_logo_ex[i].logo = NULL;
+                        continue;
+                }
                 height += fb_logo_ex[i].logo->height;
                 if (height > yres) {
                         height -= fb_logo_ex[i].logo->height;
diff --git a/drivers/video/gbefb.c b/drivers/video/gbefb.c
index f89c3cce1e0c..fe5b519860b1 100644
--- a/drivers/video/gbefb.c
+++ b/drivers/video/gbefb.c
@@ -912,6 +912,7 @@ static int gbefb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 {
         unsigned int line_length;
         struct gbe_timing_info timing;
+        int ret;
 
         /* Limit bpp to 8, 16, and 32 */
         if (var->bits_per_pixel <= 8)
@@ -930,8 +931,10 @@ static int gbefb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 
         var->grayscale = 0;     /* No grayscale for now */
 
-        if ((var->pixclock = compute_gbe_timing(var, &timing)) < 0)
-                return(-EINVAL);
+        ret = compute_gbe_timing(var, &timing);
+        var->pixclock = ret;
+        if (ret < 0)
+                return -EINVAL;
 
         /* Adjust virtual resolution, if necessary */
         if (var->xres > var->xres_virtual || (!ywrap && !ypan))
diff --git a/drivers/video/geode/gx1fb_core.c b/drivers/video/geode/gx1fb_core.c
index bb20a2289760..751e491ca8c8 100644
--- a/drivers/video/geode/gx1fb_core.c
+++ b/drivers/video/geode/gx1fb_core.c
@@ -217,8 +217,7 @@ static int __init gx1fb_map_video_memory(struct fb_info *info, struct pci_dev *d
         ret = pci_request_region(dev, 0, "gx1fb (video)");
         if (ret < 0)
                 return ret;
-        par->vid_regs = ioremap(pci_resource_start(dev, 0),
-                                pci_resource_len(dev, 0));
+        par->vid_regs = pci_ioremap_bar(dev, 0);
         if (!par->vid_regs)
                 return -ENOMEM;
 
diff --git a/drivers/video/geode/gxfb_core.c b/drivers/video/geode/gxfb_core.c
index de2b8f9876a5..484118926318 100644
--- a/drivers/video/geode/gxfb_core.c
+++ b/drivers/video/geode/gxfb_core.c
@@ -242,23 +242,21 @@ static int __init gxfb_map_video_memory(struct fb_info *info, struct pci_dev *de
         ret = pci_request_region(dev, 3, "gxfb (video processor)");
         if (ret < 0)
                 return ret;
-        par->vid_regs = ioremap(pci_resource_start(dev, 3),
-                                pci_resource_len(dev, 3));
+        par->vid_regs = pci_ioremap_bar(dev, 3);
         if (!par->vid_regs)
                 return -ENOMEM;
 
         ret = pci_request_region(dev, 2, "gxfb (display controller)");
         if (ret < 0)
                 return ret;
-        par->dc_regs = ioremap(pci_resource_start(dev, 2), pci_resource_len(dev, 2));
+        par->dc_regs = pci_ioremap_bar(dev, 2);
         if (!par->dc_regs)
                 return -ENOMEM;
 
         ret = pci_request_region(dev, 1, "gxfb (graphics processor)");
         if (ret < 0)
                 return ret;
-        par->gp_regs = ioremap(pci_resource_start(dev, 1),
-        pci_resource_len(dev, 1));
+        par->gp_regs = pci_ioremap_bar(dev, 1);
 
         if (!par->gp_regs)
                 return -ENOMEM;
diff --git a/drivers/video/geode/lxfb_core.c b/drivers/video/geode/lxfb_core.c
index 2cd9b74d2225..b965ecdbc604 100644
--- a/drivers/video/geode/lxfb_core.c
+++ b/drivers/video/geode/lxfb_core.c
@@ -379,20 +379,17 @@ static int __init lxfb_map_video_memory(struct fb_info *info,
         if (info->screen_base == NULL)
                 return ret;
 
-        par->gp_regs = ioremap(pci_resource_start(dev, 1),
-                                pci_resource_len(dev, 1));
+        par->gp_regs = pci_ioremap_bar(dev, 1);
 
         if (par->gp_regs == NULL)
                 return ret;
 
-        par->dc_regs = ioremap(pci_resource_start(dev, 2),
-                               pci_resource_len(dev, 2));
+        par->dc_regs = pci_ioremap_bar(dev, 2);
 
         if (par->dc_regs == NULL)
                 return ret;
 
-        par->vp_regs = ioremap(pci_resource_start(dev, 3),
-                               pci_resource_len(dev, 3));
+        par->vp_regs = pci_ioremap_bar(dev, 3);
 
         if (par->vp_regs == NULL)
                 return ret;
diff --git a/drivers/video/gxt4500.c b/drivers/video/gxt4500.c
index 564557792bed..896e53dea906 100644
--- a/drivers/video/gxt4500.c
+++ b/drivers/video/gxt4500.c
@@ -648,7 +648,7 @@ static int __devinit gxt4500_probe(struct pci_dev *pdev,
         info->pseudo_palette = par->pseudo_palette;
 
         info->fix.mmio_start = reg_phys;
-        par->regs = ioremap(reg_phys, pci_resource_len(pdev, 0));
+        par->regs = pci_ioremap_bar(pdev, 0);
         if (!par->regs) {
                 dev_err(&pdev->dev, "gxt4500: cannot map registers\n");
                 goto err_free_all;
@@ -656,7 +656,7 @@ static int __devinit gxt4500_probe(struct pci_dev *pdev,
 
         info->fix.smem_start = fb_phys;
         info->fix.smem_len = pci_resource_len(pdev, 1);
-        info->screen_base = ioremap(fb_phys, pci_resource_len(pdev, 1));
+        info->screen_base = pci_ioremap_bar(pdev, 1);
         if (!info->screen_base) {
                 dev_err(&pdev->dev, "gxt4500: cannot map framebuffer\n");
                 goto err_unmap_regs;
diff --git a/drivers/video/i810/i810_accel.c b/drivers/video/i810/i810_accel.c
index 76764ea3486a..f5bedee4310a 100644
--- a/drivers/video/i810/i810_accel.c
+++ b/drivers/video/i810/i810_accel.c
@@ -301,8 +301,10 @@ void i810fb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
         u32 dx, dy, width, height, dest, rop = 0, color = 0;
 
         if (!info->var.accel_flags || par->dev_flags & LOCKUP ||
-            par->depth == 4) 
-                return cfb_fillrect(info, rect);
+            par->depth == 4) {
+                cfb_fillrect(info, rect);
+                return;
+        }
 
         if (par->depth == 1) 
                 color = rect->color;
@@ -327,8 +329,10 @@ void i810fb_copyarea(struct fb_info *info, const struct fb_copyarea *region)
         u32 sx, sy, dx, dy, pitch, width, height, src, dest, xdir;
 
         if (!info->var.accel_flags || par->dev_flags & LOCKUP ||
-            par->depth == 4)
-                return cfb_copyarea(info, region);
+            par->depth == 4) {
+                cfb_copyarea(info, region);
+                return;
+        }
 
         dx = region->dx * par->depth;
         sx = region->sx * par->depth;
@@ -366,8 +370,10 @@ void i810fb_imageblit(struct fb_info *info, const struct fb_image *image)
         u32 fg = 0, bg = 0, size, dst;
         
         if (!info->var.accel_flags || par->dev_flags & LOCKUP ||
-            par->depth == 4 || image->depth != 1) 
-                return cfb_imageblit(info, image);
+            par->depth == 4 || image->depth != 1) {
+                cfb_imageblit(info, image);
+                return;
+        }
 
         switch (info->var.bits_per_pixel) {
         case 8:
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index a09e23649357..6d8e5415c809 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -1493,8 +1493,10 @@ static void intelfb_fillrect (struct fb_info *info,
         DBG_MSG("intelfb_fillrect\n");
 #endif
 
-        if (!ACCEL(dinfo, info) || dinfo->depth == 4)
-                return cfb_fillrect(info, rect);
+        if (!ACCEL(dinfo, info) || dinfo->depth == 4) {
+                cfb_fillrect(info, rect);
+                return;
+        }
 
         if (rect->rop == ROP_COPY)
                 rop = PAT_ROP_GXCOPY;
@@ -1521,8 +1523,10 @@ static void intelfb_copyarea(struct fb_info *info,
         DBG_MSG("intelfb_copyarea\n");
 #endif
 
-        if (!ACCEL(dinfo, info) || dinfo->depth == 4)
-                return cfb_copyarea(info, region);
+        if (!ACCEL(dinfo, info) || dinfo->depth == 4) {
+                cfb_copyarea(info, region);
+                return;
+        }
 
         intelfbhw_do_bitblt(dinfo, region->sx, region->sy, region->dx,
                             region->dy, region->width, region->height,
@@ -1540,8 +1544,10 @@ static void intelfb_imageblit(struct fb_info *info,
 #endif
 
         if (!ACCEL(dinfo, info) || dinfo->depth == 4
-            || image->depth != 1)
-                return cfb_imageblit(info, image);
+            || image->depth != 1) {
+                cfb_imageblit(info, image);
+                return;
+        }
 
         if (dinfo->depth != 8) {
                 fgcolor = dinfo->pseudo_palette[image->fg_color];
@@ -1554,8 +1560,10 @@ static void intelfb_imageblit(struct fb_info *info,
         if (!intelfbhw_do_drawglyph(dinfo, fgcolor, bgcolor, image->width,
                                     image->height, image->data,
                                     image->dx, image->dy,
-                                    dinfo->pitch, info->var.bits_per_pixel))
-                return cfb_imageblit(info, image);
+                                    dinfo->pitch, info->var.bits_per_pixel)) {
+                cfb_imageblit(info, image);
+                return;
+        }
 }
 
 static int intelfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c
index d3c3af53a290..16186240c5f2 100644
--- a/drivers/video/modedb.c
+++ b/drivers/video/modedb.c
@@ -329,7 +329,7 @@ const struct fb_videomode vesa_modes[] = {
           FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
           FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
         /* 17 1152x864-75 VESA */
-        { NULL, 75, 1153, 864, 9259, 256, 64, 32, 1, 128, 3,
+        { NULL, 75, 1152, 864, 9259, 256, 64, 32, 1, 128, 3,
           FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
           FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
         /* 18 1280x960-60 VESA */
diff --git a/drivers/video/neofb.c b/drivers/video/neofb.c
index bfb802d26d5a..588527a254c2 100644
--- a/drivers/video/neofb.c
+++ b/drivers/video/neofb.c
@@ -1453,7 +1453,8 @@ neo2200_imageblit(struct fb_info *info, const struct fb_image *image)
                          * is less than 16 bits wide. This is due to insufficient
                          * padding when writing the image. We need to adjust
                          * struct fb_pixmap. Not yet done. */
-                        return cfb_imageblit(info, image);
+                        cfb_imageblit(info, image);
+                        return;
                 }
                 bltCntl_flags = NEO_BC0_SRC_MONO;
         } else if (image->depth == info->var.bits_per_pixel) {
@@ -1461,7 +1462,8 @@ neo2200_imageblit(struct fb_info *info, const struct fb_image *image)
         } else {
                 /* We don't currently support hardware acceleration if image
                  * depth is different from display */
-                return cfb_imageblit(info, image);
+                cfb_imageblit(info, image);
+                return;
         }
 
         switch (info->var.bits_per_pixel) {
diff --git a/drivers/video/nvidia/nv_accel.c b/drivers/video/nvidia/nv_accel.c
index fa4821c5572b..ad6472a894ea 100644
--- a/drivers/video/nvidia/nv_accel.c
+++ b/drivers/video/nvidia/nv_accel.c
@@ -300,8 +300,10 @@ void nvidiafb_copyarea(struct fb_info *info, const struct fb_copyarea *region)
         if (info->state != FBINFO_STATE_RUNNING)
                 return;
 
-        if (par->lockup)
-                return cfb_copyarea(info, region);
+        if (par->lockup) {
+                cfb_copyarea(info, region);
+                return;
+        }
 
         NVDmaStart(info, par, BLIT_POINT_SRC, 3);
         NVDmaNext(par, (region->sy << 16) | region->sx);
@@ -319,8 +321,10 @@ void nvidiafb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
         if (info->state != FBINFO_STATE_RUNNING)
                 return;
 
-        if (par->lockup)
-                return cfb_fillrect(info, rect);
+        if (par->lockup) {
+                cfb_fillrect(info, rect);
+                return;
+        }
 
         if (info->var.bits_per_pixel == 8)
                 color = rect->color;
diff --git a/drivers/video/pm3fb.c b/drivers/video/pm3fb.c
index 68089d1456c2..6666f45a2f8c 100644
--- a/drivers/video/pm3fb.c
+++ b/drivers/video/pm3fb.c
@@ -539,8 +539,10 @@ static void pm3fb_imageblit(struct fb_info *info, const struct fb_image *image)
                 bgx = par->palette[image->bg_color];
                 break;
         }
-        if (image->depth != 1)
-                return cfb_imageblit(info, image);
+        if (image->depth != 1) {
+                cfb_imageblit(info, image);
+                return;
+        }
 
         if (info->var.bits_per_pixel == 8) {
                 fgx |= fgx << 8;
diff --git a/drivers/video/sm501fb.c b/drivers/video/sm501fb.c
index f94ae84a58cd..dcd98793d568 100644
--- a/drivers/video/sm501fb.c
+++ b/drivers/video/sm501fb.c
@@ -159,6 +159,9 @@ static int sm501_alloc_mem(struct sm501fb_info *inf, struct sm501_mem *mem,
                 break;
 
         case SM501_MEMF_PANEL:
+                if (size > inf->fbmem_len)
+                        return -ENOMEM;
+
                 ptr = inf->fbmem_len - size;
                 fbi = inf->fb[HEAD_CRT];
 
@@ -172,9 +175,6 @@ static int sm501_alloc_mem(struct sm501fb_info *inf, struct sm501_mem *mem,
                 if (fbi && ptr < fbi->fix.smem_len)
                         return -ENOMEM;
 
-                if (ptr < 0)
-                        return -ENOMEM;
-
                 break;
 
         case SM501_MEMF_CRT:
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index e21fe5b6f9ff..37b433a08ce8 100644
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -870,8 +870,10 @@ static void viafb_fillrect(struct fb_info *info,
         u32 col = 0, rop = 0;
         int pitch;
 
-        if (!viafb_accel)
-                return cfb_fillrect(info, rect);
+        if (!viafb_accel) {
+                cfb_fillrect(info, rect);
+                return;
+        }
 
         if (!rect->width || !rect->height)
                 return;
@@ -937,8 +939,10 @@ static void viafb_copyarea(struct fb_info *info,
 
         DEBUG_MSG(KERN_INFO "viafb_copyarea!!\n");
 
-        if (!viafb_accel)
-                return cfb_copyarea(info, area);
+        if (!viafb_accel) {
+                cfb_copyarea(info, area);
+                return;
+        }
 
         if (!area->width || !area->height)
                 return;
@@ -994,8 +998,10 @@ static void viafb_imageblit(struct fb_info *info,
         int i;
         int pitch;
 
-        if (!viafb_accel)
-                return cfb_imageblit(info, image);
+        if (!viafb_accel) {
+                cfb_imageblit(info, image);
+                return;
+        }
 
         udata = (u32 *) image->data;