diff options
| author | Akinobu Mita <akinobu.mita@gmail.com> | 2017-01-05 20:14:16 +0300 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2017-01-26 19:40:43 +0300 |
| commit | 7ba4dcddd51c419828a2477e9dc2dff9d32550fe (patch) | |
| tree | 4d399f096e493d565ef52e6da1cc5a979a2ef312 /drivers | |
| parent | 955f82ec9a0a251ed1ebe16ce0efd564337ce439 (diff) | |
| download | linux-7ba4dcddd51c419828a2477e9dc2dff9d32550fe.tar.xz | |
sysrq: attach sysrq handler correctly for 32-bit kernel
commit 802c03881f29844af0252b6e22be5d2f65f93fd0 upstream.
The sysrq input handler should be attached to the input device which has
a left alt key.
On 32-bit kernels, some input devices which has a left alt key cannot
attach sysrq handler. Because the keybit bitmap in struct input_device_id
for sysrq is not correctly initialized. KEY_LEFTALT is 56 which is
greater than BITS_PER_LONG on 32-bit kernels.
I found this problem when using a matrix keypad device which defines
a KEY_LEFTALT (56) but doesn't have a KEY_O (24 == 56%32).
Cc: Jiri Slaby <jslaby@suse.com>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tty/sysrq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c index 3b9b80856c1b..aefe343b4212 100644 --- a/drivers/tty/sysrq.c +++ b/drivers/tty/sysrq.c @@ -925,8 +925,8 @@ static const struct input_device_id sysrq_ids[] = { { .flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT, - .evbit = { BIT_MASK(EV_KEY) }, - .keybit = { BIT_MASK(KEY_LEFTALT) }, + .evbit = { [BIT_WORD(EV_KEY)] = BIT_MASK(EV_KEY) }, + .keybit = { [BIT_WORD(KEY_LEFTALT)] = BIT_MASK(KEY_LEFTALT) }, }, { }, }; |