aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/video/tgafb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/tgafb.c b/drivers/video/tgafb.c
index 3d5bce517d8e..65ba9921506e 100644
--- a/drivers/video/tgafb.c
+++ b/drivers/video/tgafb.c
@@ -192,8 +192,8 @@ tgafb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
192 return -EINVAL; 192 return -EINVAL;
193 193
194 /* Some of the acceleration routines assume the line width is 194 /* Some of the acceleration routines assume the line width is
195 a multiple of 64 bytes. */ 195 a multiple of 8 bytes. */
196 if (var->xres * (par->tga_type == TGA_TYPE_8PLANE ? 1 : 4) % 64) 196 if (var->xres * (par->tga_type == TGA_TYPE_8PLANE ? 1 : 4) % 8)
197 return -EINVAL; 197 return -EINVAL;
198 198
199 return 0; 199 return 0;
@@ -1280,7 +1280,7 @@ tgafb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
1280 bpp = info->var.bits_per_pixel; 1280 bpp = info->var.bits_per_pixel;
1281 1281
1282 /* Detect copies of the entire line. */ 1282 /* Detect copies of the entire line. */
1283 if (width * (bpp >> 3) == line_length) { 1283 if (!(line_length & 63) && width * (bpp >> 3) == line_length) {
1284 if (bpp == 8) 1284 if (bpp == 8)
1285 copyarea_line_8bpp(info, dy, sy, height, width); 1285 copyarea_line_8bpp(info, dy, sy, height, width);
1286 else 1286 else