GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-23 15:27:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Input: cros_ec_keyb - add back missing mask for event_type

Browse source 
In the previous patch we didn't mask out event_type in case statement,
so switches are always picked instead of buttons, which results in
ChromeOS devices misbehaving when power button is pressed.
This patch adds back the missing mask.

Fixes: d096aa3eb6 ("Input: cros_ec_keyb: mask out extra flags in event_type")
Signed-off-by: Fei Shao <fshao@chromium.org>
Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Fei Shao 2019-08-14 15:06:00 -07:00 • committed by Dmitry Torokhov
parent 0bec8b7e5c
commit 62c3801619
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/input/keyboard/cros_ec_keyb.c
View file

@ -226,6 +226,8 @@ static int cros_ec_keyb_work(struct notifier_block *nb,
{ {
struct cros_ec_keyb *ckdev = container_of(nb, struct cros_ec_keyb, struct cros_ec_keyb *ckdev = container_of(nb, struct cros_ec_keyb,
notifier); notifier);
uint8_t mkbp_event_type = ckdev->ec->event_data.event_type &
EC_MKBP_EVENT_TYPE_MASK;
u32 val; u32 val;
unsigned int ev_type; unsigned int ev_type;
@ -237,7 +239,7 @@ static int cros_ec_keyb_work(struct notifier_block *nb,
if (queued_during_suspend && !device_may_wakeup(ckdev->dev)) if (queued_during_suspend && !device_may_wakeup(ckdev->dev))
return NOTIFY_OK; return NOTIFY_OK;
switch (ckdev->ec->event_data.event_type & EC_MKBP_EVENT_TYPE_MASK) { switch (mkbp_event_type) {
case EC_MKBP_EVENT_KEY_MATRIX: case EC_MKBP_EVENT_KEY_MATRIX:
pm_wakeup_event(ckdev->dev, 0); pm_wakeup_event(ckdev->dev, 0);
@ -264,7 +266,7 @@ static int cros_ec_keyb_work(struct notifier_block *nb,
case EC_MKBP_EVENT_SWITCH: case EC_MKBP_EVENT_SWITCH:
pm_wakeup_event(ckdev->dev, 0); pm_wakeup_event(ckdev->dev, 0);
if (ckdev->ec->event_data.event_type == EC_MKBP_EVENT_BUTTON) { if (mkbp_event_type == EC_MKBP_EVENT_BUTTON) {
val = get_unaligned_le32( val = get_unaligned_le32(
&ckdev->ec->event_data.data.buttons); &ckdev->ec->event_data.data.buttons);
ev_type = EV_KEY; ev_type = EV_KEY;