diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-17 00:51:31 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-17 00:51:31 -0400 |
| commit | a2e30e529a48ef4e106e405f91cf4ae525bb01c4 (patch) | |
| tree | 2def96ef17c0672c30f1a10287552978bf1d0b1c /drivers/char/keyboard.c | |
| parent | edb3366703224d5d8df573ae698ccd6b488dc743 (diff) | |
| parent | 2ad56496627630ebc99f06af5f81ca23e17e014e (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/char/keyboard.c')
| -rw-r--r-- | drivers/char/keyboard.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c index 7b19e02f112f..523fd3c8bbaa 100644 --- a/drivers/char/keyboard.c +++ b/drivers/char/keyboard.c | |||
| @@ -198,10 +198,10 @@ int setkeycode(unsigned int scancode, unsigned int keycode) | |||
| 198 | 198 | ||
| 199 | if (scancode >= dev->keycodemax) | 199 | if (scancode >= dev->keycodemax) |
| 200 | return -EINVAL; | 200 | return -EINVAL; |
| 201 | if (keycode > KEY_MAX) | ||
| 202 | return -EINVAL; | ||
| 203 | if (keycode < 0 || keycode > KEY_MAX) | 201 | if (keycode < 0 || keycode > KEY_MAX) |
| 204 | return -EINVAL; | 202 | return -EINVAL; |
| 203 | if (keycode >> (dev->keycodesize * 8)) | ||
| 204 | return -EINVAL; | ||
| 205 | 205 | ||
| 206 | oldkey = SET_INPUT_KEYCODE(dev, scancode, keycode); | 206 | oldkey = SET_INPUT_KEYCODE(dev, scancode, keycode); |
| 207 | 207 | ||