From 18a9bf337bae26eba5d83f80a5d238d861cfc5f9 Mon Sep 17 00:00:00 2001 From: Hannes Eder Date: Tue, 6 Jan 2009 14:42:34 -0800 Subject: [PATCH] --- yaml --- r: 126389 b: refs/heads/master c: 4fa34cd051db53a07e1004c7ab078ed13e721f21 h: refs/heads/master i: 126387: ca6423c4a8c97d055a8d1deb7e1b4c81fbc96964 v: v3 --- [refs] | 2 +- trunk/drivers/video/i810/i810_accel.c | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 281e139180d4..09872009a7b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 27ec937c4f455163d6b0ab2df7a7b0161367c067 +refs/heads/master: 4fa34cd051db53a07e1004c7ab078ed13e721f21 diff --git a/trunk/drivers/video/i810/i810_accel.c b/trunk/drivers/video/i810/i810_accel.c index 76764ea3486a..f5bedee4310a 100644 --- a/trunk/drivers/video/i810/i810_accel.c +++ b/trunk/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: