From 803a4cd163e557466a5245c34a487765dd5363e9 Mon Sep 17 00:00:00 2001 From: Bananymous Date: Fri, 7 Feb 2025 21:35:25 +0200 Subject: [PATCH] Kernel: Don't enable ACPI devices when ACPI is disabled This really didn't make any sense. There are no ACPI device to be initialized when AML is not parsed :D --- kernel/kernel/kernel.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/kernel/kernel/kernel.cpp b/kernel/kernel/kernel.cpp index 21184da4..6563e645 100644 --- a/kernel/kernel/kernel.cpp +++ b/kernel/kernel/kernel.cpp @@ -228,11 +228,13 @@ static void init2(void*) dprintln("USBManager initialized"); } - if (!cmdline.disable_acpi && ACPI::ACPI::get().enter_acpi_mode(InterruptController::get().is_using_apic()).is_error()) - dprintln("Failed to enter ACPI mode"); - - if (auto ret = ACPI::ACPI::get().initialize_acpi_devices(); ret.is_error()) - dwarnln("Could not initialize ACPI devices: {}", ret.error()); + if (!cmdline.disable_acpi) + { + if (auto ret = ACPI::ACPI::get().enter_acpi_mode(InterruptController::get().is_using_apic()); ret.is_error()) + dprintln("Failed to enter ACPI mode: {}", ret.error()); + if (auto ret = ACPI::ACPI::get().initialize_acpi_devices(); ret.is_error()) + dwarnln("Could not initialize ACPI devices: {}", ret.error()); + } DevFileSystem::get().initialize_device_updater();