Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[pandora-kernel.git] / drivers / video / i810 / i810_accel.c

diff --git a/drivers/video/i810/i810_accel.c b/drivers/video/i810/i810_accel.c
index 76764ea..7672d2e 100644 (file)
--- a/drivers/video/i810/i810_accel.c
+++ b/drivers/video/i810/i810_accel.c
@@ -112,7 +112,7 @@ static inline int wait_for_engine_idle(struct fb_info *info)
  * @par: pointer to i810fb_par structure
  *
  * DESCRIPTION:
- * Checks/waits for sufficent space in ringbuffer of size
+ * Checks/waits for sufficient space in ringbuffer of size
  * space.  Returns the tail of the buffer
  */ 
 static inline u32 begin_iring(struct fb_info *info, u32 space)
@@ -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: