Merge branch 'ps2d-panic' into 'main'

ps2d: Don't crash on keyboard scan init See merge request redox-os/base!120
2026-02-09 20:22:16 -07:00
parent f08f60dc51 20eae1f054
commit 0c3936760d
1 changed files with 4 additions and 2 deletions
@@ -356,9 +356,11 @@ impl Ps2 {
        {
            // Enable keyboard data reporting
            // Use inner function to prevent retries
-            self.keyboard_command_inner(KeyboardCommand::EnableReporting as u8)?;
            // Response is ignored since scanning is now on
-            //TODO: fix by using interrupts?
+            if let Err(err) = self.keyboard_command_inner(KeyboardCommand::EnableReporting as u8) {
+                error!("failed to initialize keyboard reporting: {:?}", err);
+                //TODO: fix by using interrupts?
+            }
        }

        // Enable clocks and interrupts