[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1427299718-22820-1-git-send-email-tomeu.vizoso@collabora.com>
Date: Wed, 25 Mar 2015 17:08:36 +0100
From: Tomeu Vizoso <tomeu.vizoso@...labora.com>
To: linux-kernel@...r.kernel.org
Cc: Tomeu Vizoso <tomeu.vizoso@...labora.com>,
Dmitry Torokhov <dmitry.torokhov@...il.com>,
Lee Jones <lee.jones@...aro.org>,
Javier Martinez Canillas <javier.martinez@...labora.co.uk>,
Doug Anderson <dianders@...omium.org>,
Andrew Bresticker <abrestic@...omium.org>,
Sjoerd Simons <sjoerd.simons@...labora.co.uk>,
Bill Richardson <wfrichar@...omium.org>,
Todd Broch <tbroch@...omium.org>, linux-input@...r.kernel.org
Subject: [PATCH v2] Input: cros_ec_keyb - Clear keyboard state only when it hasn't been a wake source
As the comment right before explains, the keyboard state is to be
cleared only if the EC wasn't a wakeup source in the last suspend.
Without this commit, there's an unneeded delay when resuming from
suspend and we also lose the key that was pressed while suspended.
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@...labora.com>
---
Sorry, v1 included an unintended change.
Thanks,
Tomeu
---
drivers/input/keyboard/cros_ec_keyb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c
index 769f8f7..b50c5b8 100644
--- a/drivers/input/keyboard/cros_ec_keyb.c
+++ b/drivers/input/keyboard/cros_ec_keyb.c
@@ -341,7 +341,7 @@ static int cros_ec_keyb_resume(struct device *dev)
* wake source (e.g. the lid is open and the user might press a key to
* wake) then the key scan buffer should be preserved.
*/
- if (ckdev->ec->was_wake_device)
+ if (!ckdev->ec->was_wake_device)
cros_ec_keyb_clear_keyboard(ckdev);
return 0;
--
2.1.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists