aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMario Limonciello <[email protected]>2018-04-17 14:45:56 -0500
committerDarren Hart (VMware) <[email protected]>2018-04-23 08:52:59 -0700
commitb004b21cc664ca00782508514dade43e29eebf94 (patch)
tree40a751e8b5d7b33632cd6a1587f2e47c5754406d
parent8fddfb39a4791b3698e4e584681691567a276898 (diff)
platform/x86: dell-smbios: Match on www.dell.com in OEM strings too
Sergey reported that some much older Dell systems don't support the OEM string "Dell System" but instead supported www.dell.com in OEM strings. Match both of these to indicate that this driver is running on a Dell system. Reported-by: Sergey Kubushyn <[email protected]> Tested-by: Sergey Kubushyn <[email protected]> Signed-off-by: Mario Limonciello <[email protected]> [dvhart: Simplify DMI logic and eliminate unnecessary variables] Signed-off-by: Darren Hart (VMware) <[email protected]>
-rw-r--r--drivers/platform/x86/dell-smbios-base.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/platform/x86/dell-smbios-base.c b/drivers/platform/x86/dell-smbios-base.c
index 33fb2a20458a..9dc282ed5a9e 100644
--- a/drivers/platform/x86/dell-smbios-base.c
+++ b/drivers/platform/x86/dell-smbios-base.c
@@ -555,11 +555,10 @@ static void free_group(struct platform_device *pdev)
static int __init dell_smbios_init(void)
{
- const struct dmi_device *valid;
int ret, wmi, smm;
- valid = dmi_find_device(DMI_DEV_TYPE_OEM_STRING, "Dell System", NULL);
- if (!valid) {
+ if (!dmi_find_device(DMI_DEV_TYPE_OEM_STRING, "Dell System", NULL) &&
+ !dmi_find_device(DMI_DEV_TYPE_OEM_STRING, "www.dell.com", NULL)) {
pr_err("Unable to run on non-Dell system\n");
return -ENODEV;
}