projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.33-rc2' into for-2.6.33
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
video
/
pm3fb.c
diff --git
a/drivers/video/pm3fb.c
b/drivers/video/pm3fb.c
index 68089d1456c25167c0ece4bc5789536e8b2eef6f..6666f45a2f8ce56e03f8ecb962caad73e5b7abdd 100644
(file)
--- a/
drivers/video/pm3fb.c
+++ b/
drivers/video/pm3fb.c
@@
-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;