diff options
| author |   Mario Limonciello <mario.limonciello@dell.com> | 2017-11-01 14:25:25 -0500 |
|---|---|---|
| committer |   Darren Hart (VMware) <dvhart@infradead.org> | 2017-11-03 16:33:57 -0700 |
| commit | 7e6dcbebcbc5d8cd7d9e564d9cfbf523c2fbcb68 (patch) | |
| tree | 824c549c483b28f96c5b43d58a8abe86d308adf5 /drivers/platform | |
| parent | platform/x86: dell-wmi: increase severity of some failures (diff) | |
| download | linux-dev-7e6dcbebcbc5d8cd7d9e564d9cfbf523c2fbcb68.tar.xz linux-dev-7e6dcbebcbc5d8cd7d9e564d9cfbf523c2fbcb68.zip | |
platform/x86: dell-wmi: clean up wmi descriptor check
Some cases the wrong type was used for errors and checks can be
done more cleanly.
Signed-off-by: Mario Limonciello <mario.limonciello@dell.com>
Reviewed-by: Edward O'Callaghan <quasisec@google.com>
Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/dell-wmi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c index 2cfaaa8faf0a..b2bd396acac5 100644 --- a/drivers/platform/x86/dell-wmi.c +++ b/drivers/platform/x86/dell-wmi.c @@ -663,16 +663,16 @@ static int dell_wmi_check_descriptor_buffer(struct wmi_device *wdev) buffer = (u32 *)obj->buffer.pointer; - if (buffer[0] != 0x4C4C4544 && buffer[1] != 0x494D5720) { - dev_err(&wdev->dev, "Dell descriptor buffer has invalid signature (%*ph)\n", - 8, buffer); + if (strncmp(obj->string.pointer, "DELL WMI", 8) != 0) { + dev_err(&wdev->dev, "Dell descriptor buffer has invalid signature (%8ph)\n", + buffer); ret = -EINVAL; goto out; } if (buffer[2] != 0 && buffer[2] != 1) - dev_warn(&wdev->dev, "Dell descriptor buffer has unknown version (%d)\n", - buffer[2]); + dev_warn(&wdev->dev, "Dell descriptor buffer has unknown version (%lu)\n", + (unsigned long) buffer[2]); if (buffer[3] != 4096) dev_warn(&wdev->dev, "Dell descriptor buffer has invalid buffer length (%d)\n", |