[PATCH] intel-hid: add a workaround to ignore an event after waking up from S4.

[PATCH] intel-hid: add a workaround to ignore an event after waking up from S4.

[Alex Hung]

This is the same as the original workaround from S3 but for S4.  Without
this workaround, a rfkill event will be received and it will toggle
wireless devices when radio hotkey is not pressed.

Signed-off-by: Alex Hung <alex.hung@canonical.com>
---
 drivers/platform/x86/intel-hid.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/platform/x86/intel-hid.c b/drivers/platform/x86/intel-hid.c
index e20f23e..4ad57b9 100644
--- a/drivers/platform/x86/intel-hid.c
+++ b/drivers/platform/x86/intel-hid.c
@@ -91,6 +91,8 @@ static int intel_hid_pl_resume_handler(struct device *device)
 }
 
 static const struct dev_pm_ops intel_hid_pl_pm_ops = {
+	.freeze  = intel_hid_pl_suspend_handler,
+	.restore  = intel_hid_pl_resume_handler,
 	.suspend  = intel_hid_pl_suspend_handler,
 	.resume  = intel_hid_pl_resume_handler,
 };
-- 
2.5.0

Re: [PATCH] intel-hid: add a workaround to ignore an event after waking up from S4.

[Darren Hart]

On Mon, Mar 21, 2016 at 04:08:42PM +0800, Alex Hung wrote:
> This is the same as the original workaround from S3 but for S4.  Without
> this workaround, a rfkill event will be received and it will toggle
> wireless devices when radio hotkey is not pressed.
> 
> Signed-off-by: Alex Hung <alex.hung@canonical.com>
> ---
>  drivers/platform/x86/intel-hid.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/platform/x86/intel-hid.c b/drivers/platform/x86/intel-hid.c
> index e20f23e..4ad57b9 100644
> --- a/drivers/platform/x86/intel-hid.c
> +++ b/drivers/platform/x86/intel-hid.c
> @@ -91,6 +91,8 @@ static int intel_hid_pl_resume_handler(struct device *device)
>  }
>  
>  static const struct dev_pm_ops intel_hid_pl_pm_ops = {
> +	.freeze  = intel_hid_pl_suspend_handler,
> +	.restore  = intel_hid_pl_resume_handler,
>  	.suspend  = intel_hid_pl_suspend_handler,
>  	.resume  = intel_hid_pl_resume_handler,
>  };

Thanks Alex, queued to "fixes" for the 4.6-rc cycle.

-- 
Darren Hart
Intel Open Source Technology Center