diff --git a/src/add-ons/kernel/bus_managers/acpi/ACPICAHaiku.cpp b/src/add-ons/kernel/bus_managers/acpi/ACPICAHaiku.cpp
index a65c9166bc..3aad4e020e 100644
--- a/src/add-ons/kernel/bus_managers/acpi/ACPICAHaiku.cpp
+++ b/src/add-ons/kernel/bus_managers/acpi/ACPICAHaiku.cpp
@@ -772,10 +772,9 @@ AcpiOsRemoveInterruptHandler(UINT32 interruptNumber,
 	DEBUG_FUNCTION_F("vector: %lu; handler: %p", (uint32)interruptNumber,
 		serviceRoutine);
 #ifdef _KERNEL_MODE
-	remove_io_interrupt_handler(interruptNumber,
-		(interrupt_handler) serviceRoutine,
-		sInterruptHandlerData[interruptNumber]);
-	return AE_OK;
+	return remove_io_interrupt_handler(interruptNumber,
+		(interrupt_handler)serviceRoutine,
+		sInterruptHandlerData[interruptNumber]) == B_OK ? AE_OK : AE_ERROR;
 #else
 	return AE_ERROR;
 #endif
diff --git a/src/add-ons/kernel/bus_managers/acpi/EmbeddedController.h b/src/add-ons/kernel/bus_managers/acpi/EmbeddedController.h
index d0149d9c30..d4c71814ab 100644
--- a/src/add-ons/kernel/bus_managers/acpi/EmbeddedController.h
+++ b/src/add-ons/kernel/bus_managers/acpi/EmbeddedController.h
@@ -188,15 +188,13 @@ static status_t
 EcLock(struct acpi_ec_cookie *sc)
 {
 	/* If _GLK is non-zero, acquire the global lock. */
-	status_t status = B_OK;
 	if (sc->ec_glk) {
-		status = sc->ec_acpi_module->acquire_global_lock(EC_LOCK_TIMEOUT,
+		status_t status = sc->ec_acpi_module->acquire_global_lock(EC_LOCK_TIMEOUT,
 			&sc->ec_glkhandle);
 		if (status != B_OK)
 			return status;
 	}
-	mutex_lock(&sc->ec_lock);
-	return status;
+	return mutex_lock(&sc->ec_lock);
 }