diff options
| author | Alex Hung <alex.hung@canonical.com> | 2016-03-21 16:08:42 +0800 |
|---|---|---|
| committer | Darren Hart <dvhart@linux.intel.com> | 2016-03-28 10:00:47 -0700 |
| commit | 45aa56cd0ffc2ebc2274f1bacc985b6f032c0120 (patch) | |
| tree | 80c917de2686e1d1ec4015f278a9ccace6132dea | |
| parent | f55532a0c0b8bb6148f4e07853b876ef73bc69ca (diff) | |
| download | linux-45aa56cd0ffc2ebc2274f1bacc985b6f032c0120.tar.gz linux-45aa56cd0ffc2ebc2274f1bacc985b6f032c0120.tar.bz2 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>
| -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, }; |