| Message ID | 20210205201002.181710-1-alex.hung@canonical.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [V2] lib: acpi: load acpi tables from sysfs by default | expand |
On 2/6/21 4:10 AM, Alex Hung wrote: > Signed-off-by: Alex Hung <alex.hung@canonical.com> > --- > > [V2] Fix comments were not updated > > src/lib/src/fwts_acpi_tables.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c > index 4033e29b..2b45fae3 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); > + /* Load from sysfs failed (e.g. no /dev/mem), so try memory */ Should /dev/mem also be modified? > + if (ret != FWTS_OK) > + ret = fwts_acpi_load_tables_from_firmware(fw); > + else > require_fixup = true; > - } > + > } else { > ret = FWTS_ERROR_NO_PRIV; > } >
diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c index 4033e29b..2b45fae3 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); + /* Load from sysfs failed (e.g. no /dev/mem), so try memory */ + if (ret != FWTS_OK) + ret = fwts_acpi_load_tables_from_firmware(fw); + else require_fixup = true; - } + } else { ret = FWTS_ERROR_NO_PRIV; }
Signed-off-by: Alex Hung <alex.hung@canonical.com> --- [V2] Fix comments were not updated src/lib/src/fwts_acpi_tables.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)