aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/console/bitblit.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/video/console/bitblit.c b/drivers/video/console/bitblit.c
index 12eaf0aa87e6..6550875ef9c5 100644
--- a/drivers/video/console/bitblit.c
+++ b/drivers/video/console/bitblit.c
@@ -114,7 +114,7 @@ static void bit_putcs(struct vc_data *vc, struct fb_info *info,
114 unsigned int scan_align = info->pixmap.scan_align - 1; 114 unsigned int scan_align = info->pixmap.scan_align - 1;
115 unsigned int buf_align = info->pixmap.buf_align - 1; 115 unsigned int buf_align = info->pixmap.buf_align - 1;
116 unsigned int shift_low = 0, mod = vc->vc_font.width % 8; 116 unsigned int shift_low = 0, mod = vc->vc_font.width % 8;
117 unsigned int shift_high = 8, pitch, cnt, size, k; 117 unsigned int shift_high = 8, pitch, cnt, size, i, k;
118 unsigned int idx = vc->vc_font.width >> 3; 118 unsigned int idx = vc->vc_font.width >> 3;
119 unsigned int attribute = get_attribute(info, scr_readw(s)); 119 unsigned int attribute = get_attribute(info, scr_readw(s));
120 struct fb_image image; 120 struct fb_image image;
@@ -175,7 +175,11 @@ static void bit_putcs(struct vc_data *vc, struct fb_info *info,
175 src = buf; 175 src = buf;
176 } 176 }
177 177
178 fb_pad_aligned_buffer(dst, pitch, src, idx, image.height); 178 if (idx == 1)
179 for(i=0; i < image.height; i++)
180 dst[pitch*i] = src[i];
181 else
182 fb_pad_aligned_buffer(dst, pitch, src, idx, image.height);
179 dst += width; 183 dst += width;
180 } 184 }
181 } 185 }