From f215c79f99fb94a353d5fdfb467cbbdd4402b14c Mon Sep 17 00:00:00 2001 From: "Antonino A. Daplas" Date: Mon, 12 Dec 2005 22:17:20 -0800 Subject: [PATCH] --- yaml --- r: 15105 b: refs/heads/master c: 7275b4b6bc2f783c135c3f0eeecc4fdc6e788aa8 h: refs/heads/master i: 15103: c64de43fd37c093c24cf8213078713178c63734b v: v3 --- [refs] | 2 +- trunk/drivers/video/cfbimgblt.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 030856a1e7a6..8bed86bf39c8 100644 --- 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 index a7770c4f17d0..7a01742a82af 100644 --- 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? */