patch-pre2.0.5 linux/drivers/char/console.c

• Lines: 46
• Date: Wed May 15 09:06:55 1996
• Orig file: pre2.0.4/linux/drivers/char/console.c
• Orig date: Tue May 7 16:22:23 1996

diff -u --recursive --new-file pre2.0.4/linux/drivers/char/console.c linux/drivers/char/console.c
@@ -2116,11 +2116,6 @@
 {
 	int currcons;
 
-#ifdef CONFIG_APM
-	if (apm_display_blank())
-		return;
-#endif
-
 	if (console_blanked)
 		return;
 
@@ -2146,6 +2141,10 @@
 	hide_cursor();
 	console_blanked = fg_console + 1;
 
+#ifdef CONFIG_APM
+	if (apm_display_blank())
+		return;
+#endif
 	if(!nopowersave)
 	    vesa_blank();
 }
@@ -2156,11 +2155,6 @@
 	int resetorg;
 	long offset;
 
-#ifdef CONFIG_APM
-	if (apm_display_unblank())
-		return;
-#endif
-
 	if (!console_blanked)
 		return;
 	if (!vc_cons_allocated(fg_console)) {
@@ -2193,6 +2187,10 @@
 		__set_origin(blank__origin);
 
 	vesa_unblank();
+#ifdef CONFIG_APM
+	if (apm_display_unblank())
+		return;
+#endif
 }
 
 /*