--- linux/drivers/char/console.c.orig	Tue Nov 11 10:39:58 1997
+++ linux/drivers/char/console.c	Tue Nov 11 10:40:10 1997
@@ -60,6 +60,8 @@
  * User-defined bell sound, new setterm control sequences and printk
  * redirection by Martin Mares <mj@k332.feld.cvut.cz> 19-Nov-95
  *
+ * APM screenblank bug fixed Takashi Manabe <manabe@roy.dsl.tutics.tut.jp>
+ * Backported to 2.0.31 by Adam Bradley <artdodge@cs.bu.edu>
  */
 
 #define BLANK 0x0020
@@ -2151,12 +2153,13 @@
 	hide_cursor();
 	console_blanked = fg_console + 1;
 
+	if (!nopowersave) {
 #ifdef CONFIG_APM
 	if (apm_display_blank())
 		return;
 #endif
-	if(!nopowersave)
 	    vesa_blank();
+	}
 }
 
 void do_unblank_screen(void)