summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorCarlo Caione <carlo@endlessm.com>2017-04-09 15:56:07 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-11-15 17:13:11 +0100
commitce93b664540d84b87fbbf21b5e85fbba554d83ed (patch)
tree8242a6b7be9850f39b5f2764d9f7db8377cc77ba /drivers
parentdf5371592acafa60029bb990ca85f007be60d0f1 (diff)
platform/x86: hp-wmi: Fix error value for hp_wmi_tablet_state
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/platform/x86/hp-wmi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index 056a671165d1..7703e22aa7e5 100644
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -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;
}