From: Carlo Caione <carlo@endlessm.com>
Date: Sun, 9 Apr 2017 13:56:07 +0000 (+0200)
Subject: platform/x86: hp-wmi: Fix error value for hp_wmi_tablet_state
X-Git-Tag: archive/raspbian/4.9.80-2+rpi1~7^2~1385
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0a18a94af43f934e00b438d466996c37769d5daf;p=linux-4.9.git

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>
---

diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index 3d28318b342c..2b721fd19a7a 100644
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -290,7 +290,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;
 }