From ca6423c4a8c97d055a8d1deb7e1b4c81fbc96964 Mon Sep 17 00:00:00 2001
From: Hannes Eder <hannes@hanneseder.net>
Date: Tue, 6 Jan 2009 14:42:33 -0800
Subject: [PATCH] --- yaml --- r: 126387 b: refs/heads/master c:
 7654532dbeb6cc3fb35b12449f71f1d97e26fa9a h: refs/heads/master i:   126385:
 11fbb85566ca46a0b7df2f7fb6efe6e91b6b96ee   126383:
 a15cc32a8ca4ab940cc9680dd63f91e5c563e90a v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/video/pm3fb.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index af90d09bb3db..c48db0f0d051 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2899bb09418786132079bb6495ba8f1ce86eb0c6
+refs/heads/master: 7654532dbeb6cc3fb35b12449f71f1d97e26fa9a
diff --git a/trunk/drivers/video/pm3fb.c b/trunk/drivers/video/pm3fb.c
index 68089d1456c2..6666f45a2f8c 100644
--- a/trunk/drivers/video/pm3fb.c
+++ b/trunk/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;