[PATCH v2] Input: cros_ec_keyb - Clear keyboard state only when it hasn't been a wake source

[PATCH v2] Input: cros_ec_keyb - Clear keyboard state only when it hasn't been a wake source

[Tomeu Vizoso]

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@collabora.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

Re: [PATCH v2] Input: cros_ec_keyb - Clear keyboard state only when it hasn't been a wake source

[Javier Martinez Canillas]

Hello Tomeu,

On 03/25/2015 05:08 PM, Tomeu Vizoso wrote:
> 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@collabora.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);
>  

Your change matches the comment indeed and makes more sense.

Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>

Best regards,
Javier

Re: [PATCH v2] Input: cros_ec_keyb - Clear keyboard state only when it hasn't been a wake source

[Dmitry Torokhov]

On Wed, Mar 25, 2015 at 07:45:23PM +0100, Javier Martinez Canillas wrote:
> Hello Tomeu,
> 
> On 03/25/2015 05:08 PM, Tomeu Vizoso wrote:
> > 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@collabora.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);
> >  
> 
> Your change matches the comment indeed and makes more sense.
> 
> Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>

Applied, thank you.

-- 
Dmitry