Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 126386
b: refs/heads/master
c: 2899bb0
h: refs/heads/master
v: v3
  • Loading branch information
Hannes Eder authored and Linus Torvalds committed Jan 6, 2009
1 parent 11fbb85 commit 81dd5a1
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6875145940efdc9851df8aaa251453d33cda62a4
refs/heads/master: 2899bb09418786132079bb6495ba8f1ce86eb0c6
18 changes: 12 additions & 6 deletions trunk/drivers/video/via/viafbdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit 81dd5a1

Please sign in to comment.