From e0972df96d72f7e4e18f11a1ea63f676b1afb3f3 Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Mon, 12 Feb 2007 00:54:53 -0800 Subject: [PATCH] --- yaml --- r: 48049 b: refs/heads/master c: 36f71405e63f3d1e4c2a8dd98523820bbca8e078 h: refs/heads/master i: 48047: 9b307501b905c3815942ae25eacef21ef99c174f v: v3 --- [refs] | 2 +- trunk/drivers/video/tgafb.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 972069ce4223..ee20ae982dc4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee9a25e5df81f4392439055c28989dfd4b18d894 +refs/heads/master: 36f71405e63f3d1e4c2a8dd98523820bbca8e078 diff --git a/trunk/drivers/video/tgafb.c b/trunk/drivers/video/tgafb.c index 0a00a6cc7c2b..9c23a783e713 100644 --- a/trunk/drivers/video/tgafb.c +++ b/trunk/drivers/video/tgafb.c @@ -885,7 +885,7 @@ copyarea_line_8bpp(struct fb_info *info, u32 dy, u32 sy, n64 = (height * width) / 64; - if (dy < sy) { + if (sy < dy) { spos = (sy + height) * width; dpos = (dy + height) * width; @@ -933,7 +933,7 @@ copyarea_line_32bpp(struct fb_info *info, u32 dy, u32 sy, n16 = (height * width) / 16; - if (dy < sy) { + if (sy < dy) { src = tga_fb + (sy + height) * width * 4; dst = tga_fb + (dy + height) * width * 4;