lkml.org 
[lkml]   [2017]   [Oct]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 02/14] platform/x86: dell-wmi: clean up wmi descriptor check
    Date
    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>
    ---
    drivers/platform/x86/dell-wmi.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c
    index 1fbef560ca67..5973aa20f10e 100644
    --- a/drivers/platform/x86/dell-wmi.c
    +++ b/drivers/platform/x86/dell-wmi.c
    @@ -665,16 +665,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_warn(&wdev->dev, "Dell descriptor buffer has invalid signature (%*ph)\n",
    - 8, buffer);
    + if (strncmp(obj->string.pointer, "DELL WMI", 8) != 0)
    + dev_warn(&wdev->dev, "Dell descriptor buffer has invalid signature (%8ph)\n",
    + buffer);

    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 (%u)\n",
    buffer[2]);

    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 (%u)\n",
    buffer[3]);

    priv->interface_version = buffer[2];
    --
    2.14.1
    \
     
     \ /
      Last update: 2017-10-05 00:50    [W:2.362 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site