summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-core.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2018-10-23 13:17:27 +0200
committerJiri Kosina <jkosina@suse.cz>2018-10-23 13:17:27 +0200
commitd93af50ed68c0f079fa10491c6bd56daf74d601b (patch)
tree5fa3f21d3cfda844812b6779da1a26985e450cad /drivers/hid/hid-core.c
parent037ad063f7977176323da9299102e706674486e5 (diff)
parent8473a93d1ba5385f63a128a285702ccc1d3ae2cc (diff)
downloadblackbird-obmc-linux-d93af50ed68c0f079fa10491c6bd56daf74d601b.tar.gz
blackbird-obmc-linux-d93af50ed68c0f079fa10491c6bd56daf74d601b.zip
Merge branch 'for-4.20/core' into for-linus
Fixes and new features for driver core. Highlights: - maximum global item tag report size gets increased to 256 - improved INPUT_PROP reporting for Digitizer devices
Diffstat (limited to 'drivers/hid/hid-core.c')
-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 44564f61e9cc..5bec9244c45b 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -406,7 +406,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 > 128) {
+ if (parser->global.report_size > 256) {
hid_err(parser->device, "invalid report_size %d\n",
parser->global.report_size);
return -1;
OpenPOWER on IntegriCloud