2006-07-30 Johan Rydberg <jrydberg@gnu.org>

        * kern/efi/efi.c (grub_efi_set_text_mode): Assume console already
        is in text mode if there is no console control protocol instance
        available.

diff --git a/ChangeLog b/ChangeLog
index f231d1ae0b4accb4095e354e74d3f4b2e215f996..31b959586093529ea0a00b6e07251d2879280227 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-30  Johan Rydberg  <jrydberg@gnu.org>
+
+       * kern/efi/efi.c (grub_efi_set_text_mode): Assume console already
+       is in text mode if there is no console control protocol instance
+       available.
+
 2006-07-29  Vesa Jaaskelainen  <chaac@nic.fi>
 
        * include/grub/video.h: Code cleanup.

diff --git a/kern/efi/efi.c b/kern/efi/efi.c
index fd395568260c3e878c56ccd96726fade9715b6a0..312f8f948913b6f3a937f616808a2cf44bea8406 100644 (file)
--- a/kern/efi/efi.c
+++ b/kern/efi/efi.c
@@ -125,7 +125,9 @@ grub_efi_set_text_mode (int on)
 
   c = grub_efi_locate_protocol (&console_control_guid, 0);
   if (! c)
-    return 0;
+    /* No console control protocol instance available, assume it is
+       already in text mode. */
+    return 1;
   
   if (c->get_mode (c, &mode, 0, 0) != GRUB_EFI_SUCCESS)
     return 0;