diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-18 08:31:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-18 08:31:14 -0800 |
| commit | 83c5aac175e182c30729650f2edee3294c3b8bb0 (patch) | |
| tree | 33a3ad885a9c74da05b25a97d9cc6b448b07861f | |
| parent | 2fa298cf6d6bedf64f75644e9e8b0d64d2d83f27 (diff) | |
| parent | 3b77fd8ee6a8ae34e349651e9d5f5000d1cc206e (diff) | |
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
| -rw-r--r-- | drivers/input/serio/i8042.c | 8 | ||||
| -rw-r--r-- | include/linux/input.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index d84a36e545f..b54aee7cd9e 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, }; diff --git a/include/linux/input.h b/include/linux/input.h index 735ceaf1bc2..663208afb64 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -376,6 +376,7 @@ struct input_absinfo { #define KEY_DISPLAY_OFF 245 /* display device to off state */ #define KEY_WIMAX 246 +#define KEY_RFKILL 247 /* Key that controls all radios */ /* Range 248 - 255 is reserved for special needs of AT keyboard driver */ |