From 0e6644188468aab18dcf935992ffbe3fda9843ea Mon Sep 17 00:00:00 2001
From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 5 Jan 2010 11:45:52 +0100
Subject: [PATCH] --- yaml --- r: 180828 b: refs/heads/master c:
 722612cd51cf1b574c89dff57cc5dbedf1f645bb h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/hid/hid-core.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7e315933ec25..ff58662f831d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf2f765f1896064e34c6f0f2ef896ff058dd5c06
+refs/heads/master: 722612cd51cf1b574c89dff57cc5dbedf1f645bb
diff --git a/trunk/drivers/hid/hid-core.c b/trunk/drivers/hid/hid-core.c
index 6462c923805f..a4b496c68259 100644
--- a/trunk/drivers/hid/hid-core.c
+++ b/trunk/drivers/hid/hid-core.c
@@ -387,7 +387,8 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)
 	__u32 data;
 	unsigned n;
 
-	if (item->size == 0) {
+	/* Local delimiter could have value 0, which allows size to be 0 */
+	if (item->size == 0 && item->tag != HID_LOCAL_ITEM_TAG_DELIMITER) {
 		dbg_hid("item data expected for local item\n");
 		return -1;
 	}