diff options
| author | Alex Hung | 2016-03-21 09:08:42 +0100 |
|---|---|---|
| committer | Darren Hart | 2016-03-28 19:00:47 +0200 |
| commit | 45aa56cd0ffc2ebc2274f1bacc985b6f032c0120 (patch) | |
| tree | 80c917de2686e1d1ec4015f278a9ccace6132dea /drivers/platform | |
| parent | Linux 4.6-rc1 (diff) | |
| download | kernel-qcow2-linux-45aa56cd0ffc2ebc2274f1bacc985b6f032c0120.tar.gz kernel-qcow2-linux-45aa56cd0ffc2ebc2274f1bacc985b6f032c0120.tar.xz kernel-qcow2-linux-45aa56cd0ffc2ebc2274f1bacc985b6f032c0120.zip | |
intel-hid: add a workaround to ignore an event after waking up from S4.
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>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/intel-hid.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/platform/x86/intel-hid.c b/drivers/platform/x86/intel-hid.c index f93abc8c1424..a818db6aa08f 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, }; |