60918b
From 174387405e98cd94c627832ae23abcb9be7e5623 Mon Sep 17 00:00:00 2001
60918b
From: Jean Delvare <jdelvare@suse.de>
60918b
Date: Wed, 31 Jan 2018 18:52:47 +0100
60918b
Subject: [PATCH 1/3] dmidecode: Fix firmware version of TPM device
60918b
60918b
Both the operator (detected by clang, reported by Xorg) and the mask
60918b
for the minor firmware version field of TPM devices were wrong.
60918b
60918b
Signed-off-by: Jean Delvare <jdelvare@suse.de>
60918b
Fixes: 48a8132058a0 ("dmidecode: Add support for structure type 43 (TPM Device)")
60918b
---
60918b
 dmidecode.c | 2 +-
60918b
 1 file changed, 1 insertion(+), 1 deletion(-)
60918b
60918b
diff --git a/dmidecode.c b/dmidecode.c
60918b
index 87faaa9..a593170 100644
60918b
--- a/dmidecode.c
60918b
+++ b/dmidecode.c
60918b
@@ -4511,7 +4511,7 @@ static void dmi_decode(const struct dmi_header *h, u16 ver)
60918b
 				case 0x02:
60918b
 					printf("\tFirmware Revision: %u.%u\n",
60918b
 						DWORD(data + 0x0A) >> 16,
60918b
-						DWORD(data + 0x0A) && 0xFF);
60918b
+						DWORD(data + 0x0A) & 0xFFFF);
60918b
 					/*
60918b
 					 * We skip the next 4 bytes, as their
60918b
 					 * format is not standardized and their
60918b
-- 
60918b
2.9.5
60918b