diff --git a/ChangeLog b/ChangeLog
index f231d1ae0..31b959586 100644
--- 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 fd3955682..312f8f948 100644
--- 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;