diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
| commit | c973b112c76c9d8fd042991128f218a738cc8d0a (patch) | |
| tree | e813b0da5d0a0e19e06de6462d145a29ad683026 /drivers/char/keyboard.c | |
| parent | c5fbc3966f48279dbebfde10248c977014aa9988 (diff) | |
| parent | 00dd1e433967872f3997a45d5adf35056fdf2f56 (diff) | |
Merge with /shiny/git/linux-2.6/.git
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 | ||