Commit 7e6dcbeb authored by Mario Limonciello's avatar Mario Limonciello Committed by Darren Hart (VMware)

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: default avatarMario Limonciello <mario.limonciello@dell.com>
Reviewed-by: default avatarEdward O'Callaghan <quasisec@google.com>
Suggested-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: default avatarPali Rohár <pali.rohar@gmail.com>
Signed-off-by: default avatarDarren Hart (VMware) <dvhart@infradead.org>
parent d0bf42d8
...@@ -663,16 +663,16 @@ static int dell_wmi_check_descriptor_buffer(struct wmi_device *wdev) ...@@ -663,16 +663,16 @@ static int dell_wmi_check_descriptor_buffer(struct wmi_device *wdev)
buffer = (u32 *)obj->buffer.pointer; buffer = (u32 *)obj->buffer.pointer;
if (buffer[0] != 0x4C4C4544 && buffer[1] != 0x494D5720) { if (strncmp(obj->string.pointer, "DELL WMI", 8) != 0) {
dev_err(&wdev->dev, "Dell descriptor buffer has invalid signature (%*ph)\n", dev_err(&wdev->dev, "Dell descriptor buffer has invalid signature (%8ph)\n",
8, buffer); buffer);
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }
if (buffer[2] != 0 && buffer[2] != 1) if (buffer[2] != 0 && buffer[2] != 1)
dev_warn(&wdev->dev, "Dell descriptor buffer has unknown version (%d)\n", dev_warn(&wdev->dev, "Dell descriptor buffer has unknown version (%lu)\n",
buffer[2]); (unsigned long) buffer[2]);
if (buffer[3] != 4096) if (buffer[3] != 4096)
dev_warn(&wdev->dev, "Dell descriptor buffer has invalid buffer length (%d)\n", dev_warn(&wdev->dev, "Dell descriptor buffer has invalid buffer length (%d)\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment