From 467a3a90521cbf05881d3fb8045fa1afc5341a7d Mon Sep 17 00:00:00 2001 From: srinivas pandruvada Date: Thu, 10 May 2012 16:45:31 -0700 Subject: [PATCH] --- yaml --- r: 305054 b: refs/heads/master c: 0cd516c246759bb57b69d836b625d8f8c566e8ca h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/hid/hid-core.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index eff81242a8d7..fea2b7c6c25d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6d7c873529abd622897cad5e36f1fd7d82f5110 +refs/heads/master: 0cd516c246759bb57b69d836b625d8f8c566e8ca diff --git a/trunk/drivers/hid/hid-core.c b/trunk/drivers/hid/hid-core.c index 0cddcaa3fe7f..0bfbc4813ad0 100644 --- a/trunk/drivers/hid/hid-core.c +++ b/trunk/drivers/hid/hid-core.c @@ -230,9 +230,15 @@ static int hid_add_field(struct hid_parser *parser, unsigned report_type, unsign return -1; } - if (parser->global.logical_maximum < parser->global.logical_minimum) { - hid_err(parser->device, "logical range invalid %d %d\n", - parser->global.logical_minimum, parser->global.logical_maximum); + if ((parser->global.logical_minimum < 0 && + parser->global.logical_maximum < + parser->global.logical_minimum) || + (parser->global.logical_minimum >= 0 && + (__u32)parser->global.logical_maximum < + (__u32)parser->global.logical_minimum)) { + dbg_hid("logical range invalid 0x%x 0x%x\n", + parser->global.logical_minimum, + parser->global.logical_maximum); return -1; }