aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/video/cfbimgblt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/cfbimgblt.c b/drivers/video/cfbimgblt.c
index a7770c4f17d0..7a01742a82af 100644
--- a/drivers/video/cfbimgblt.c
+++ b/drivers/video/cfbimgblt.c
@@ -162,6 +162,8 @@ static inline void slow_imageblit(const struct fb_image *image, struct fb_info *
162 u32 i, j, l; 162 u32 i, j, l;
163 163
164 dst2 = (u32 __iomem *) dst1; 164 dst2 = (u32 __iomem *) dst1;
165 fgcolor <<= LEFT_POS(bpp);
166 bgcolor <<= LEFT_POS(bpp);
165 167
166 for (i = image->height; i--; ) { 168 for (i = image->height; i--; ) {
167 shift = val = 0; 169 shift = val = 0;
@@ -180,7 +182,6 @@ static inline void slow_imageblit(const struct fb_image *image, struct fb_info *
180 while (j--) { 182 while (j--) {
181 l--; 183 l--;
182 color = (*s & 1 << (BIT_NR(l))) ? fgcolor : bgcolor; 184 color = (*s & 1 << (BIT_NR(l))) ? fgcolor : bgcolor;
183 color <<= LEFT_POS(bpp);
184 val |= SHIFT_HIGH(color, shift); 185 val |= SHIFT_HIGH(color, shift);
185 186
186 /* Did the bitshift spill bits to the next long? */ 187 /* Did the bitshift spill bits to the next long? */