Patchwork [Oneiric,3/3] (pre-stable) HID: bump maximum global item tag report size to 96 bytes

login
register
mail settings
Submitter Chase Douglas
Date Nov. 16, 2011, 6:37 p.m.
Message ID <1321468623-7847-4-git-send-email-chase.douglas@canonical.com>
Download mbox | patch
Permalink /patch/126013/
State New
Headers show

Comments

Chase Douglas - Nov. 16, 2011, 6:37 p.m.
This allows the latest N-Trig devices to function properly.

BugLink: https://bugs.launchpad.net/bugs/724831

Cc: stable@vger.kernel.org
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---
This has been accepted into Jiri Kosina's git tree for 3.4. It will eventually
come down through the stable queue in three or four months, but it should be
applied to 11.10 in the meantime.

 drivers/hid/hid-core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Leann Ogasawara - Nov. 22, 2011, 3:16 p.m.
On Wed, 2011-11-16 at 10:37 -0800, Chase Douglas wrote:
> This allows the latest N-Trig devices to function properly.
> 
> BugLink: https://bugs.launchpad.net/bugs/724831
> 
> Cc: stable@vger.kernel.org
> Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
> Signed-off-by: Jiri Kosina <jkosina@suse.cz>

Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com>

> ---
> This has been accepted into Jiri Kosina's git tree for 3.4. It will eventually
> come down through the stable queue in three or four months, but it should be
> applied to 11.10 in the meantime.
> 
>  drivers/hid/hid-core.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
> index 4f81d20..1691c99 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;
> -- 
> 1.7.5.4
> 
>

Patch

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 4f81d20..1691c99 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;