From 7b0ea5178adb3ab4aad90afe29a5df7a197edbd9 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Tue, 15 Nov 2011 14:36:09 -0800 Subject: [PATCH] --- yaml --- r: 275479 b: refs/heads/master c: 66e13e66b6c4e5b2ecd6225e1f8437640cfb6498 h: refs/heads/master i: 275477: 2f81db27e9ac9f8dfcb2c5a24155ba817bcb03be 275475: c3a316280025c982cc98aab43c64efa1d69fab80 275471: 78d252fe982fbc960835deab65047b06a478e1a7 v: v3 --- [refs] | 2 +- trunk/drivers/firmware/dmi_scan.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 59ce736f77f9..8baf75b00e91 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5aecc85abdb9ac2b0e6548d13652a34142e7ae89 +refs/heads/master: 66e13e66b6c4e5b2ecd6225e1f8437640cfb6498 diff --git a/trunk/drivers/firmware/dmi_scan.c b/trunk/drivers/firmware/dmi_scan.c index bcb1126e3d00..153980be4ee6 100644 --- a/trunk/drivers/firmware/dmi_scan.c +++ b/trunk/drivers/firmware/dmi_scan.c @@ -585,14 +585,12 @@ int dmi_name_in_serial(const char *str) } /** - * dmi_name_in_vendors - Check if string is anywhere in the DMI vendor information. + * dmi_name_in_vendors - Check if string is in the DMI system or board vendor name * @str: Case sensitive Name */ int dmi_name_in_vendors(const char *str) { - static int fields[] = { DMI_BIOS_VENDOR, DMI_BIOS_VERSION, DMI_SYS_VENDOR, - DMI_PRODUCT_NAME, DMI_PRODUCT_VERSION, DMI_BOARD_VENDOR, - DMI_BOARD_NAME, DMI_BOARD_VERSION, DMI_NONE }; + static int fields[] = { DMI_SYS_VENDOR, DMI_BOARD_VENDOR, DMI_NONE }; int i; for (i = 0; fields[i] != DMI_NONE; i++) { int f = fields[i];