| Message ID | 20210203055022.59826-2-alex.hung@canonical.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] Revert "lib: fwts_acpi_tables: add option for dump acpi table from sysfs" | expand |
On 03/02/2021 05:50, Alex Hung wrote: > Signed-off-by: Alex Hung <alex.hung@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; > } > Acked-by: Colin Ian King <colin.king@canonical.com>
On 2/3/21 1:50 PM, Alex Hung wrote: > Signed-off-by: Alex Hung <alex.hung@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 */ comment should be modified as well. > - 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; > } >
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; }
Signed-off-by: Alex Hung <alex.hung@canonical.com> --- src/lib/src/fwts_acpi_tables.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)