---

yaml --- r: 15105 b: refs/heads/master c: 7275b4b h: refs/heads/master i: 15103: c64de43 v: v3
git-mirror · Dec 13, 2005 · f215c79 · f215c79
1 parent c78a32b
commit f215c79
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39942fd8ff57c8623451bbfaffe8a184cc8b463a
+refs/heads/master: 7275b4b6bc2f783c135c3f0eeecc4fdc6e788aa8
diff --git a/trunk/drivers/video/cfbimgblt.c b/trunk/drivers/video/cfbimgblt.c
@@ -162,6 +162,8 @@ static inline void slow_imageblit(const struct fb_image *image, struct fb_info *
 	u32 i, j, l;
 
 	dst2 = (u32 __iomem *) dst1;
+	fgcolor <<= LEFT_POS(bpp);
+	bgcolor <<= LEFT_POS(bpp);
 
 	for (i = image->height; i--; ) {
 		shift = val = 0;
@@ -180,7 +182,6 @@ static inline void slow_imageblit(const struct fb_image *image, struct fb_info *
 		while (j--) {
 			l--;
 			color = (*s & 1 << (BIT_NR(l))) ? fgcolor : bgcolor;
-			color <<= LEFT_POS(bpp);
 			val |= SHIFT_HIGH(color, shift);
 
 			/* Did the bitshift spill bits to the next long? */