Kernel/HID: Don't assume that ACPI is initialized

This commit is contained in:
Liav A 2021-05-08 15:37:10 +03:00 committed by Andreas Kling
parent b05a6a1701
commit f7b5352af0
Notes: sideshowbarker 2024-07-18 18:29:50 +09:00

View file

@ -107,7 +107,9 @@ UNMAP_AFTER_INIT void HIDManagement::enumerate()
// emulation of the PS/2 controller if it was set by the BIOS.
// If ACPI indicates we have an i8042 controller and the USB controller was
// set to emulate PS/2, we should not initialize the PS/2 controller.
if (!ACPI::Parser::the()->have_8042() || kernel_command_line().disable_ps2_controller())
if (kernel_command_line().disable_ps2_controller())
return;
if (ACPI::Parser::the() && !ACPI::Parser::the()->have_8042())
return;
m_i8042_controller = I8042Controller::initialize();
m_i8042_controller->detect_devices();