From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752759AbdK1SGO (ORCPT ); Tue, 28 Nov 2017 13:06:14 -0500 Received: from mail.netline.ch ([148.251.143.178]:43261 "EHLO netline-mail3.netline.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750850AbdK1SGN (ORCPT ); Tue, 28 Nov 2017 13:06:13 -0500 Subject: Re: [PATCH] platform/x86: hp-wmi: Actually use mask parameter in hp_wmi_hw_state To: Darren Hart Cc: Andy Shevchenko , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org References: <20171128151758.9234-1-michel@daenzer.net> <20171128165724.GA16349@fury> From: =?UTF-8?Q?Michel_D=c3=a4nzer?= Message-ID: Date: Tue, 28 Nov 2017 19:06:08 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <20171128165724.GA16349@fury> Content-Type: text/plain; charset=utf-8 Content-Language: en-CA Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2017-11-28 05:57 PM, Darren Hart wrote: > On Tue, Nov 28, 2017 at 04:17:58PM +0100, Michel Dänzer wrote: >> 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; > > The current code does: > > return !!(state & mask); > > See: > 9968e12 platform/x86: hp-wmi: Fix tablet mode detection for convertibles > > Merged in 4.15-rc1 AFAIK commits without Cc: stable@vger.kernel.org don't get automatically picked up for stable branches. Can you manually nominate 9968e12 for stable? Thanks, -- Earthling Michel Dänzer | http://www.amd.com Libre software enthusiast | Mesa and X developer