From c0f61f2789b94d55e934e5e584ae19f77d87c4fe Mon Sep 17 00:00:00 2001
From: Hannes Eder <hannes@hanneseder.net>
Date: Tue, 6 Jan 2009 14:42:34 -0800
Subject: [PATCH] --- yaml --- r: 126388 b: refs/heads/master c:
 27ec937c4f455163d6b0ab2df7a7b0161367c067 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c48db0f0d051..281e139180d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7654532dbeb6cc3fb35b12449f71f1d97e26fa9a
+refs/heads/master: 27ec937c4f455163d6b0ab2df7a7b0161367c067
diff --git a/trunk/drivers/video/neofb.c b/trunk/drivers/video/neofb.c
index bfb802d26d5a..588527a254c2 100644
--- a/trunk/drivers/video/neofb.c
+++ b/trunk/drivers/video/neofb.c
@@ -1453,7 +1453,8 @@ 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) {
@@ -1461,7 +1462,8 @@ neo2200_imageblit(struct fb_info *info, const struct fb_image *image)
 	} 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) {