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

Alex Hung alex.hung at canonical.com
Tue Jun 28 09:02:57 UTC 2016


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 at canonical.com>
Signed-off-by: Darren Hart <dvhart at linux.intel.com>
(cherry picked from commit 45aa56cd0ffc2ebc2274f1bacc985b6f032c0120)
Signed-off-by: Alex Hung <alex.hung at 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 f93abc8..a818db6 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.7.4





More information about the kernel-team mailing list