summaryrefslogtreecommitdiff
path: root/drivers/hid
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@canonical.com>2011-11-07 11:08:05 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2012-01-25 17:24:37 -0800
commit729a9768761809079d07c9716f656da20a14eb2f (patch)
tree1706cca008cdb06b8e20e53f8c6848736662323e /drivers/hid
parentdbbef3cbdef5e2363caeb343efa68650f20d7bfc (diff)
HID: bump maximum global item tag report size to 96 bytes
commit e46e927b9b7e8d95526e69322855243882b7e1a3 upstream. This allows the latest N-Trig devices to function properly. BugLink: https://bugs.launchpad.net/bugs/724831 Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 763797da2d8a..22d53e7a2230 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -361,7 +361,7 @@ static int hid_parser_global(struct hid_parser *parser, struct hid_item *item)
case HID_GLOBAL_ITEM_TAG_REPORT_SIZE:
parser->global.report_size = item_udata(item);
- if (parser->global.report_size > 32) {
+ if (parser->global.report_size > 96) {
dbg_hid("invalid report_size %d\n",
parser->global.report_size);
return -1;