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

This commit is contained in:
Linus Torvalds 2006-01-31 21:18:17 -08:00
commit d20e6336ea
18 changed files with 545 additions and 266 deletions

View file

@ -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;
}