[PATCH] lib: fwts_acpi_tables: use bit-wise & rather than logical &&

Colin King colin.king at canonical.com
Fri Feb 19 13:27:26 UTC 2021


From: Colin Ian King <colin.king at canonical.com>

The masking is currently using logical && operator instead of the
bit-wise & operator.  Fix this.

Fixes: 09216cd3701f ("lib: fwts_acpi_tables: update fwts_get_acpi_version (mantis: 2105)")
Signed-off-by: Colin Ian King <colin.king at canonical.com>
---
 src/lib/src/fwts_acpi_tables.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c
index d522dfbc..455d3a6b 100644
--- a/src/lib/src/fwts_acpi_tables.c
+++ b/src/lib/src/fwts_acpi_tables.c
@@ -1773,7 +1773,7 @@ uint32_t fwts_get_acpi_version(fwts_framework *fw)
 	}
 
 	fadt = (fwts_acpi_table_fadt *) table->data;
-	minor = ((fadt->minor_version && 0xF) << 4) + ((fadt->minor_version && 0xF0) >> 4);
+	minor = ((fadt->minor_version & 0xF) << 4) + ((fadt->minor_version & 0xF0) >> 4);
 	acpi_version = (fadt->header.revision << 8) + minor;
 
 	/* check FACP returns an invalid value */
-- 
2.30.0




More information about the fwts-devel mailing list