Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 126387
b: refs/heads/master
c: 7654532
h: refs/heads/master
i:
  126385: 11fbb85
  126383: a15cc32
v: v3
  • Loading branch information
Hannes Eder authored and Linus Torvalds committed Jan 6, 2009
1 parent 81dd5a1 commit ca6423c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 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: 2899bb09418786132079bb6495ba8f1ce86eb0c6
refs/heads/master: 7654532dbeb6cc3fb35b12449f71f1d97e26fa9a
6 changes: 4 additions & 2 deletions trunk/drivers/video/pm3fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit ca6423c

Please sign in to comment.