summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Chavent <paul.chavent@onera.fr>2013-07-07 17:43:56 +0200
committerJiri Kosina <jkosina@suse.cz>2013-07-13 00:19:50 +0200
commit38ead6ef1d94e782bec49002ff65f2bdaddfeb15 (patch)
treea7d1016323a3359fe46da60befcaee5ea4d3876c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff)
downloadlinux-38ead6ef1d94e782bec49002ff65f2bdaddfeb15.tar.xz
linux-38ead6ef1d94e782bec49002ff65f2bdaddfeb15.zip
HID: core: fix hid delimiter local tag parsing.
When device with the DELIMITER tag in its report descriptor is encountered during parsing, it's mistakenly immediately refused by HID core for no justifiable reason. [jkosina@suse.cz: polish changelog] Signed-off-by: Paul Chavent <paul.chavent@onera.fr> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-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 e39dac68063c..8de5cb8319b9 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -450,7 +450,7 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)
}
parser->local.delimiter_depth--;
}
- return 1;
+ return 0;
case HID_LOCAL_ITEM_TAG_USAGE: