summaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorGabriele Mazzotta <gabriele.mzt@gmail.com>2016-03-29 22:10:41 +0200
committerJiri Kosina <jkosina@suse.cz>2016-04-01 11:34:11 +0200
commit0a0f5b7e5b56829b91d3637cf6999e0ade791ddb (patch)
tree666c7dbc50e3a80bda2c2da67f82edb424c7e66a /drivers/hid
parentHID: wacom: fix Bamboo ONE oops (diff)
downloadlinux-0a0f5b7e5b56829b91d3637cf6999e0ade791ddb.tar.xz
linux-0a0f5b7e5b56829b91d3637cf6999e0ade791ddb.zip
HID: multitouch: Synchronize MT frame on reset_resume
input_mt_get_slot_by_key() requires input_mt_sync_frame() to be called at each frame. Do it when releasing the touches, or else we won't get a proper slot number after mt_reset_resume(). Signed-off-by: Gabriele Mazzotta <gabriele.mzt@gmail.com> Reviewed-by: Benson Leung <bleung@chromium.org> Reviewed-by: Benjamin TIssoires <benjamin.tissoires@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-multitouch.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 25d3c4330bf6..c741f5e50a66 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -1169,6 +1169,7 @@ static void mt_release_contacts(struct hid_device *hid)
MT_TOOL_FINGER,
false);
}
+ input_mt_sync_frame(input_dev);
input_sync(input_dev);
}
}