diff options
author | 2010-02-18 08:31:14 -0800 | |
---|---|---|
committer | 2010-02-18 08:31:14 -0800 | |
commit | 83c5aac175e182c30729650f2edee3294c3b8bb0 (patch) | |
tree | 33a3ad885a9c74da05b25a97d9cc6b448b07861f /drivers | |
parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 (diff) | |
parent | Input: add KEY_RFKILL (diff) | |
download | linux-dev-83c5aac175e182c30729650f2edee3294c3b8bb0.tar.xz linux-dev-83c5aac175e182c30729650f2edee3294c3b8bb0.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: add KEY_RFKILL
Input: i8042 - fix KBC jam during hibernate
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/input/serio/i8042.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index d84a36e545f6..b54aee7cd9e3 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c @@ -1161,9 +1161,17 @@ static int i8042_pm_restore(struct device *dev) return 0; } +static int i8042_pm_thaw(struct device *dev) +{ + i8042_interrupt(0, NULL); + + return 0; +} + static const struct dev_pm_ops i8042_pm_ops = { .suspend = i8042_pm_reset, .resume = i8042_pm_restore, + .thaw = i8042_pm_thaw, .poweroff = i8042_pm_reset, .restore = i8042_pm_restore, }; |