summaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>2015-02-26 03:56:27 +0100
committerJiri Kosina <jkosina@suse.cz>2015-03-16 16:21:18 +0100
commiteb96483349e946f10d41c2a5674922e1d86603d9 (patch)
tree8f16a4f5150241d83a68958a05a0c05611a9fe6b /drivers/hid
parentHID: hid-sensor-hub: Enhance feature report set API (diff)
downloadlinux-eb96483349e946f10d41c2a5674922e1d86603d9.tar.xz
linux-eb96483349e946f10d41c2a5674922e1d86603d9.zip
HID: hid-sensor-hub: fix attribute read for logical usage id
For defining enumeration values like report or power status events, the enumeration usage ids are enclosed in a logical collection. In this case we need to match logical usage id for pending read on this usage id. For example, in the below field, when read is requested for 0319, the report will contain one of the status usages like 850, 851 etc. In this case the raw event will not match 0319. So when logical collection matches, then wake up the pending thread. Physical(Sensor.OtherCustom) Logical(Sensor.0319) Application(Sensor.Sensor) Usage(6) Sensor.0850 Sensor.0851 Sensor.0852 Sensor.0853 Sensor.0854 Sensor.0855 Logical Minimum(1) Logical Maximum(5) Report Size(8) Report Count(1) Report Offset(24) Flags( Array Absolute ) Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-sensor-hub.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c
index 44da796fa4fd..96f18be9c4e1 100644
--- a/drivers/hid/hid-sensor-hub.c
+++ b/drivers/hid/hid-sensor-hub.c
@@ -495,8 +495,10 @@ static int sensor_hub_raw_event(struct hid_device *hdev,
ptr += sz;
continue;
}
- if (hsdev->pending.status && hsdev->pending.attr_usage_id ==
- report->field[i]->usage->hid) {
+ if (hsdev->pending.status && (hsdev->pending.attr_usage_id ==
+ report->field[i]->usage->hid ||
+ hsdev->pending.attr_usage_id ==
+ report->field[i]->logical)) {
hid_dbg(hdev, "data was pending ...\n");
hsdev->pending.raw_data = kmemdup(ptr, sz, GFP_ATOMIC);
if (hsdev->pending.raw_data)