fbdev/amifb: Correct check for video memory size

[linux-2.6.git] / drivers / video / pm3fb.c

diff --git a/drivers/video/pm3fb.c b/drivers/video/pm3fb.c
index f00048bb302551689477c6189fc05f94bbd6e7a2..6666f45a2f8ce56e03f8ecb962caad73e5b7abdd 100644 (file)
--- a/drivers/video/pm3fb.c
+++ b/drivers/video/pm3fb.c
@@ -45,7 +45,7 @@
 #undef PM3FB_MASTER_DEBUG
 #ifdef PM3FB_MASTER_DEBUG
 #define DPRINTK(a, b...)       \
-       printk(KERN_DEBUG "pm3fb: %s: " a, __FUNCTION__ , ## b)
+       printk(KERN_DEBUG "pm3fb: %s: " a, __func__ , ## b)
 #else
 #define DPRINTK(a, b...)
 #endif
@@ -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;