Input: cros_ec_keyb - add back missing mask for event_type
authorFei Shao <fshao@chromium.org>
Wed, 14 Aug 2019 22:06:00 +0000 (15:06 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 16 Aug 2019 18:30:44 +0000 (11:30 -0700)
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: d096aa3eb604 ("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>
drivers/input/keyboard/cros_ec_keyb.c

index 38cb6d8..bef7bee 100644 (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,
                                                  notifier);
+       uint8_t mkbp_event_type = ckdev->ec->event_data.event_type &
+                                 EC_MKBP_EVENT_TYPE_MASK;
        u32 val;
        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))
                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:
                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:
                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(
                                        &ckdev->ec->event_data.data.buttons);
                        ev_type = EV_KEY;