diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-01 00:18:17 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-01 00:18:17 -0500 |
| commit | d20e6336ea4250e51081e4b2924b9ef4dfa45909 (patch) | |
| tree | 96c22694bec10912d40a3700a945157597dd901b /drivers/usb | |
| parent | fa3c791d85aa9a363dd72dd834b73b79252ef44e (diff) | |
| parent | 6dea93477c3377cf4199fd37cc3fb11071987ae4 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/input/hiddev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/input/hiddev.c b/drivers/usb/input/hiddev.c index 77be6b9a820f..925f5aba06f5 100644 --- a/drivers/usb/input/hiddev.c +++ b/drivers/usb/input/hiddev.c | |||
| @@ -631,7 +631,7 @@ static int hiddev_ioctl(struct inode *inode, struct file *file, unsigned int cmd | |||
| 631 | 631 | ||
| 632 | else if ((cmd == HIDIOCGUSAGES || cmd == HIDIOCSUSAGES) && | 632 | else if ((cmd == HIDIOCGUSAGES || cmd == HIDIOCSUSAGES) && |
| 633 | (uref_multi->num_values > HID_MAX_MULTI_USAGES || | 633 | (uref_multi->num_values > HID_MAX_MULTI_USAGES || |
| 634 | uref->usage_index + uref_multi->num_values >= field->report_count)) | 634 | uref->usage_index + uref_multi->num_values > field->report_count)) |
| 635 | goto inval; | 635 | goto inval; |
| 636 | } | 636 | } |
| 637 | 637 | ||