---

yaml --- r: 360983 b: refs/heads/master c: a40e7cf h: refs/heads/master i: 360981: be72acf 360979: aef8fc9 360975: d497fef v: v3
git-mirror · Mar 8, 2013 · 6546a11 · 6546a11
1 parent 4c94629
commit 6546a11
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc893e19b5800d7743fb58235877bfa9091805ff
+refs/heads/master: a40e7cf8f06b4e322ba902e4e9f6a6b0c2daa907
diff --git a/trunk/drivers/firmware/dmi_scan.c b/trunk/drivers/firmware/dmi_scan.c
@@ -442,7 +442,6 @@ static int __init dmi_present(const char __iomem *p)
 static int __init smbios_present(const char __iomem *p)
 {
 	u8 buf[32];
-	int offset = 0;
 
 	memcpy_fromio(buf, p, 32);
 	if ((buf[5] < 32) && dmi_checksum(buf, buf[5])) {
@@ -461,9 +460,9 @@ static int __init smbios_present(const char __iomem *p)
 			dmi_ver = 0x0206;
 			break;
 		}
-		offset = 16;
+		return memcmp(p + 16, "_DMI_", 5) || dmi_present(p + 16);
 	}
-	return dmi_present(buf + offset);
+	return 1;
 }
 
 void __init dmi_scan_machine(void)