OSDN Git Service

platform/x86: hp-wmi: Fix error value for hp_wmi_tablet_state
authorCarlo Caione <carlo@endlessm.com>
Sun, 9 Apr 2017 13:56:07 +0000 (15:56 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 15 Nov 2017 16:13:11 +0000 (17:13 +0100)
commit c7dfc2facbd69dad89b75e13c608da709668dcd0 upstream.

hp_wmi_tablet_state() fails to return the correct error code when
hp_wmi_perform_query() returns the HP WMI query specific error code
that is a positive value.

Signed-off-by: Carlo Caione <carlo@endlessm.com>
Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
Cc: Philip Müller <philm@manjaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/platform/x86/hp-wmi.c

index 056a671..7703e22 100644 (file)
@@ -291,7 +291,7 @@ static int hp_wmi_tablet_state(void)
        int ret = hp_wmi_perform_query(HPWMI_HARDWARE_QUERY, 0, &state,
                                       sizeof(state), sizeof(state));
        if (ret)
-               return ret;
+               return -EINVAL;
 
        return (state & 0x4) ? 1 : 0;
 }