mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Michel Dänzer" <michel@daenzer.net>
To: Darren Hart <dvhart@infradead.org>, Andy Shevchenko <andy@infradead.org>
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	[thread overview]
Message-ID: <20171128151758.9234-1-michel@daenzer.net> (raw)

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 <michel@daenzer.net>
---
 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

             reply	other threads:[~2017-11-28 15:18 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-28 15:17 Michel Dänzer [this message]
2017-11-28 16:57 ` Darren Hart
2017-11-28 18:06   ` Michel Dänzer
2017-11-28 19:30     ` Andy Shevchenko
2017-11-28 19:41       ` Michel Dänzer
2017-12-01 19:39         ` Darren Hart
2017-12-04  8:31           ` Michel Dänzer
2017-12-01 19:52         ` Andy Shevchenko
2017-12-01 20:13           ` Darren Hart

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171128151758.9234-1-michel@daenzer.net \
    --to=michel@daenzer.net \
    --cc=andy@infradead.org \
    --cc=dvhart@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=platform-driver-x86@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®