From 6546a1130578665838ae016204bcbad0f6c3af0c Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 8 Mar 2013 12:43:32 -0800 Subject: [PATCH] --- yaml --- r: 360983 b: refs/heads/master c: a40e7cf8f06b4e322ba902e4e9f6a6b0c2daa907 h: refs/heads/master i: 360981: be72acf400ca42e5395af29ea24cccf590d2c930 360979: aef8fc95bec77316a39ef3b590c4b88a7f1fec2d 360975: d497fefb4c80a6714f75dc6b75f5109e8eac36c0 v: v3 --- [refs] | 2 +- trunk/drivers/firmware/dmi_scan.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8a69b0aa4921..1bb076e3fc1d 100644 --- 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 index 982f1f5f5742..4cd392dbf115 100644 --- 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)