| From foo@baz Sat Jul 28 10:14:30 CEST 2018 |
| From: Mario Limonciello <mario.limonciello@dell.com> |
| Date: Tue, 17 Apr 2018 14:45:56 -0500 |
| Subject: platform/x86: dell-smbios: Match on www.dell.com in OEM strings too |
| |
| From: Mario Limonciello <mario.limonciello@dell.com> |
| |
| [ Upstream commit b004b21cc664ca00782508514dade43e29eebf94 ] |
| |
| 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 <ksi@koi8.net> |
| Tested-by: Sergey Kubushyn <ksi@koi8.net> |
| Signed-off-by: Mario Limonciello <mario.limonciello@dell.com> |
| [dvhart: Simplify DMI logic and eliminate unnecessary variables] |
| Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/platform/x86/dell-smbios-base.c | 5 ++--- |
| 1 file changed, 2 insertions(+), 3 deletions(-) |
| |
| --- 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_d |
| |
| 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; |
| } |
