[PATCH 2/2] lib: acpi: load acpi tables from sysfs by default

Alex Hung alex.hung at canonical.com
Wed Feb 3 05:50:22 UTC 2021


Signed-off-by: Alex Hung <alex.hung at canonical.com>
---
 src/lib/src/fwts_acpi_tables.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c
index 82b7448d..caa4450b 100644
--- a/src/lib/src/fwts_acpi_tables.c
+++ b/src/lib/src/fwts_acpi_tables.c
@@ -1244,13 +1244,14 @@ int fwts_acpi_load_tables(fwts_framework *fw)
 		ret = fwts_acpi_load_tables_from_acpidump(fw);
 		require_fixup = true;
 	} else if (fwts_check_root_euid(fw, true) == FWTS_OK) {
-		ret = fwts_acpi_load_tables_from_firmware(fw);
+		ret = fwts_acpi_load_tables_from_sysfs(fw);
 
 		/* Load from memory failed (e.g. no /dev/mem), so try sysfs */
-		if (ret != FWTS_OK) {
-			ret = fwts_acpi_load_tables_from_sysfs(fw);
+		if (ret != FWTS_OK)
+			ret = fwts_acpi_load_tables_from_firmware(fw);
+		else
 			require_fixup = true;
-		}
+
 	} else {
 		ret = FWTS_ERROR_NO_PRIV;
 	}
-- 
2.25.1




More information about the fwts-devel mailing list