summaryrefslogtreecommitdiffstats
path: root/drivers/usb/input
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-31 21:18:17 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-31 21:18:17 -0800
commitd20e6336ea4250e51081e4b2924b9ef4dfa45909 (patch)
tree96c22694bec10912d40a3700a945157597dd901b /drivers/usb/input
parentfa3c791d85aa9a363dd72dd834b73b79252ef44e (diff)
parent6dea93477c3377cf4199fd37cc3fb11071987ae4 (diff)
downloadop-kernel-dev-d20e6336ea4250e51081e4b2924b9ef4dfa45909.zip
op-kernel-dev-d20e6336ea4250e51081e4b2924b9ef4dfa45909.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
Diffstat (limited to 'drivers/usb/input')
-rw-r--r--drivers/usb/input/hiddev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/input/hiddev.c b/drivers/usb/input/hiddev.c
index 77be6b9..925f5ab 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
else if ((cmd == HIDIOCGUSAGES || cmd == HIDIOCSUSAGES) &&
(uref_multi->num_values > HID_MAX_MULTI_USAGES ||
- uref->usage_index + uref_multi->num_values >= field->report_count))
+ uref->usage_index + uref_multi->num_values > field->report_count))
goto inval;
}
OpenPOWER on IntegriCloud