From ff82bf29c82849dce87160e33b993513b610714c Mon Sep 17 00:00:00 2001 From: Knut Petersen Date: Mon, 9 Jan 2006 20:53:36 -0800 Subject: [PATCH] --- yaml --- r: 17655 b: refs/heads/master c: 244ab72d84a04d40bd270da604161e02af73fb11 h: refs/heads/master i: 17653: 77d89cbb4851908b01333ecf3ca6d3656e203286 17651: 8374541d809737b42a4e7622c141a54fc5571720 17647: 0c936d27dd9ffd9b158c47592197074b6185d9f9 v: v3 --- [refs] | 2 +- trunk/drivers/video/console/fbcon.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7f5bc732baf4..70dacb197fb2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f08ff4a4dab1ebef06d154050fb80ce2c13fc9c +refs/heads/master: 244ab72d84a04d40bd270da604161e02af73fb11 diff --git a/trunk/drivers/video/console/fbcon.c b/trunk/drivers/video/console/fbcon.c index f05afc02de2a..4f6fc785e95f 100644 --- a/trunk/drivers/video/console/fbcon.c +++ b/trunk/drivers/video/console/fbcon.c @@ -1965,7 +1965,8 @@ static __inline__ void updatescrollmode(struct display *p, divides(ypan, vc->vc_font.height) && vyres > yres; int good_wrap = (cap & FBINFO_HWACCEL_YWRAP) && divides(ywrap, vc->vc_font.height) && - divides(vc->vc_font.height, vyres); + divides(vc->vc_font.height, vyres) && + divides(vc->vc_font.height, yres); int reading_fast = cap & FBINFO_READS_FAST; int fast_copyarea = (cap & FBINFO_HWACCEL_COPYAREA) && !(cap & FBINFO_HWACCEL_DISABLED);