From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753610AbdK1PSD (ORCPT ); Tue, 28 Nov 2017 10:18:03 -0500 Received: from mail.netline.ch ([148.251.143.178]:41471 "EHLO netline-mail3.netline.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753269AbdK1PSB (ORCPT ); Tue, 28 Nov 2017 10:18:01 -0500 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= To: Darren Hart , Andy Shevchenko Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] platform/x86: hp-wmi: Actually use mask parameter in hp_wmi_hw_state Date: Tue, 28 Nov 2017 16:17:58 +0100 Message-Id: <20171128151758.9234-1-michel@daenzer.net> X-Mailer: git-send-email 2.15.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We were always checking bit 0 (which represents the docked state) regardless of the mask. Fixes the "tablet mode" state always being reported the same as the docked state, which with current libinput can cause the built-in input devices of laptops to be incorrectly disabled while docked. Cc: stable@vger.kernel.org Fixes: ("platform/x86: hp-wmi: Refactor dock and tablet state fetchers") Signed-off-by: Michel Dänzer --- drivers/platform/x86/hp-wmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c index b4ed3dc983d5..2bdd6bbdb353 100644 --- a/drivers/platform/x86/hp-wmi.c +++ b/drivers/platform/x86/hp-wmi.c @@ -297,7 +297,7 @@ static int hp_wmi_hw_state(int mask) if (state < 0) return state; - return state & 0x1; + return (state & mask) ? 1 : 0; } static int __init hp_wmi_bios_2008_later(void) -- 2.15.0