Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 126388
b: refs/heads/master
c: 27ec937
h: refs/heads/master
v: v3
  • Loading branch information
Hannes Eder authored and Linus Torvalds committed Jan 6, 2009
1 parent ca6423c commit c0f61f2
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: 7654532dbeb6cc3fb35b12449f71f1d97e26fa9a
refs/heads/master: 27ec937c4f455163d6b0ab2df7a7b0161367c067
6 changes: 4 additions & 2 deletions trunk/drivers/video/neofb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1453,15 +1453,17 @@ neo2200_imageblit(struct fb_info *info, const struct fb_image *image)
* is less than 16 bits wide. This is due to insufficient
* padding when writing the image. We need to adjust
* struct fb_pixmap. Not yet done. */
return cfb_imageblit(info, image);
cfb_imageblit(info, image);
return;
}
bltCntl_flags = NEO_BC0_SRC_MONO;
} else if (image->depth == info->var.bits_per_pixel) {
bltCntl_flags = 0;
} else {
/* We don't currently support hardware acceleration if image
* depth is different from display */
return cfb_imageblit(info, image);
cfb_imageblit(info, image);
return;
}

switch (info->var.bits_per_pixel) {
Expand Down

0 comments on commit c0f61f2

Please sign in to comment.