summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Duggan <aduggan@synaptics.com>2014-12-08 15:02:00 -0800
committerJiri Kosina <jkosina@suse.cz>2014-12-09 09:03:06 +0100
commitdf9e11ffae0f71b7667e17c137bc8e6ea4491236 (patch)
tree4f9724f7359fe804db92601f95e80a8be6ad8a6f
parenta966fdd5830e83c790032bfa45c6a6079cda6374 (diff)
downloadlinux-df9e11ffae0f71b7667e17c137bc8e6ea4491236.tar.gz
HID: rmi: The address of query8 must be calculated based on which query registers are present
If a touchpad does not report relative data then query 6 will not be present and the address of query 8 will be one less. This patches calculates the location of query 8 instead of hardcoding the offset. Signed-off-by: Andrew Duggan <aduggan@synaptics.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/hid-rmi.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
index a994477bd25a..b51200fe2f33 100644
--- a/drivers/hid/hid-rmi.c
+++ b/drivers/hid/hid-rmi.c
@@ -632,17 +632,6 @@ static int rmi_populate_f11(struct hid_device *hdev)
has_rel = !!(buf[0] & BIT(3));
has_gestures = !!(buf[0] & BIT(5));
- if (has_gestures) {
- /* query 8 to find out if query 10 exists */
- ret = rmi_read(hdev, data->f11.query_base_addr + 8, buf);
- if (ret) {
- hid_err(hdev, "can not read gesture information: %d.\n",
- ret);
- return ret;
- }
- has_query10 = !!(buf[0] & BIT(2));
- }
-
/*
* At least 4 queries are guaranteed to be present in F11
* +1 for query 5 which is present since absolute events are
@@ -653,8 +642,19 @@ static int rmi_populate_f11(struct hid_device *hdev)
if (has_rel)
++query_offset; /* query 6 is present */
- if (has_gestures)
+ if (has_gestures) {
+ /* query 8 to find out if query 10 exists */
+ ret = rmi_read(hdev,
+ data->f11.query_base_addr + query_offset + 1, buf);
+ if (ret) {
+ hid_err(hdev, "can not read gesture information: %d.\n",
+ ret);
+ return ret;
+ }
+ has_query10 = !!(buf[0] & BIT(2));
+
query_offset += 2; /* query 7 and 8 are present */
+ }
if (has_query9)
++query_offset;