Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

[linux-2.6.git] / drivers / usb / input / hiddev.c

diff --git a/drivers/usb/input/hiddev.c b/drivers/usb/input/hiddev.c
index 77be6b9a820ff4fddffe0727e8d3f7add23ac63e..925f5aba06f583555c4f521c7bc2e809caf9f921 100644 (file)
--- 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;
                        }