diff options
| author |   Huzefa Kankroliwala <huzefa.nomanx.kankroliwala@intel.com> | 2013-04-03 05:45:21 -0700 |
|---|---|---|
| committer |   Jiri Kosina <jkosina@suse.cz> | 2013-04-04 09:59:32 +0200 |
| commit | 7c4d577367fb710ea74a56955c5e3546fe5dd7ac (patch) | |
| tree | 2e30de664d1f64d122a49b19604916f873f3fcdb | |
| parent | HID: Merge branch 'master' into for-3.10/hid-driver-transport-cleanups (diff) | |
| download | linux-dev-7c4d577367fb710ea74a56955c5e3546fe5dd7ac.tar.xz linux-dev-7c4d577367fb710ea74a56955c5e3546fe5dd7ac.zip | |
HID: i2c-hid: fix length for set/get report in i2c hid
With the current i2c hid driver set/get report does not work
as expected, for e.g sensor hub properties like power state,
frequency etc is not set properly on the device as a result
we do not get events.
The problem is that i2c hid driver in function i2c_hid_request
sets length equal to default buffer size for which the sensor
hub does not respond on get/set commands. Use report length
and calculate it based on report size and id.
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Huzefa Kankroliwala <huzefa.nomanx.kankroliwala@intel.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| -rw-r--r-- | drivers/hid/i2c-hid/i2c-hid.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c index 935f387be95a..2b1799a3b212 100644 --- a/drivers/hid/i2c-hid/i2c-hid.c +++ b/drivers/hid/i2c-hid/i2c-hid.c @@ -567,18 +567,17 @@ static void i2c_hid_request(struct hid_device *hid, struct hid_report *rep, int reqtype) { struct i2c_client *client = hid->driver_data; - struct i2c_hid *ihid = i2c_get_clientdata(client); char *buf; int ret; + int len = i2c_hid_get_report_length(rep) - 2; - buf = kzalloc(ihid->bufsize, GFP_KERNEL); + buf = kzalloc(len, GFP_KERNEL); if (!buf) return; switch (reqtype) { case HID_REQ_GET_REPORT: - ret = i2c_hid_get_raw_report(hid, rep->id, buf, ihid->bufsize, - rep->type); + ret = i2c_hid_get_raw_report(hid, rep->id, buf, len, rep->type); if (ret < 0) dev_err(&client->dev, "%s: unable to get report: %d\n", __func__, ret); @@ -587,7 +586,7 @@ static void i2c_hid_request(struct hid_device *hid, struct hid_report *rep, break; case HID_REQ_SET_REPORT: hid_output_report(rep, buf); - i2c_hid_output_raw_report(hid, buf, ihid->bufsize, rep->type); + i2c_hid_output_raw_report(hid, buf, len, rep->type); break; } |