patch-2.0.32 linux/drivers/char/console.c

Next file: linux/drivers/char/ftape/ecc.c
Previous file: linux/arch/i386/mm/fault.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.0.31/linux/drivers/char/console.c linux/drivers/char/console.c
@@ -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,14 @@
 	hide_cursor();
 	console_blanked = fg_console + 1;
 
+	if(!nopowersave)
+	{
 #ifdef CONFIG_APM
-	if (apm_display_blank())
-		return;
+		if (apm_display_blank())
+			return;
 #endif
-	if(!nopowersave)
-	    vesa_blank();
+		vesa_blank();
+	}
 }
 
 void do_unblank_screen(void)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov