From 9ae9ae74772279dc1516b1498471dac280b58db9 Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires Date: Tue, 4 Dec 2012 16:27:50 +0100 Subject: [PATCH] --- yaml --- r: 343065 b: refs/heads/master c: c737bcf92ea206d3b5d351890f1ade9e12ad4cbe h: refs/heads/master i: 343063: 4c07b11fba38ac28a3c2b04c579234423c197696 v: v3 --- [refs] | 2 +- trunk/drivers/hid/i2c-hid/i2c-hid.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 09b2a6b0854f..c0c7f4bbe8a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 134ebfd86b9353a3d98f9f4e93b4e79824a4b49a +refs/heads/master: c737bcf92ea206d3b5d351890f1ade9e12ad4cbe diff --git a/trunk/drivers/hid/i2c-hid/i2c-hid.c b/trunk/drivers/hid/i2c-hid/i2c-hid.c index aab3357626c7..c823a16f35ac 100644 --- a/trunk/drivers/hid/i2c-hid/i2c-hid.c +++ b/trunk/drivers/hid/i2c-hid/i2c-hid.c @@ -399,9 +399,10 @@ static void i2c_hid_init_report(struct hid_report *report, u8 *buffer, unsigned int size, ret_size; size = i2c_hid_get_report_length(report); - i2c_hid_get_report(client, + if (i2c_hid_get_report(client, report->type == HID_FEATURE_REPORT ? 0x03 : 0x01, - report->id, buffer, size); + report->id, buffer, size)) + return; i2c_hid_dbg(ihid, "report (len=%d): %*ph\n", size, size, ihid->inbuf);