at_keyboard: initialize keyboard in module init if keyboard is ready

The change in 0c62a5b2 caused at_keyboard to fail on some
machines. Immediately initializing the keyboard in the module init if
the keyboard is ready makes the problem go away.

Bug-Debian: https://bugs.debian.org/741464
Last-Update: 2019-02-09

Patch-Name: at_keyboard-module-init.patch

Gbp-Pq: Name at_keyboard-module-init.patch

diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c
index f8a129eb7f1f3cbc2e104274e8b14c15ada86377..3dbf89c5deb30e15ac922e2ff8a8fb96f2e6411c 100644 (file)
--- a/grub-core/term/at_keyboard.c
+++ b/grub-core/term/at_keyboard.c
@@ -254,6 +254,14 @@ grub_at_keyboard_getkey (struct grub_term_input *term __attribute__ ((unused)))
   return ret;
 }
 
+static grub_err_t
+grub_keyboard_controller_mod_init (struct grub_term_input *term __attribute__ ((unused))) {
+  if (KEYBOARD_COMMAND_ISREADY (grub_inb (KEYBOARD_REG_STATUS)))
+    grub_keyboard_controller_init ();
+
+  return GRUB_ERR_NONE;
+}
+
 static void
 grub_keyboard_controller_init (void)
 {
@@ -324,6 +332,7 @@ grub_at_restore_hw (void)
 static struct grub_term_input grub_at_keyboard_term =
   {
     .name = "at_keyboard",
+    .init = grub_keyboard_controller_mod_init,
     .fini = grub_keyboard_controller_fini,
     .getkey = grub_at_keyboard_getkey
   };