diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-05-09 13:20:04 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-05-09 13:20:04 +0200 |
commit | 4096e645d85d575e7b6e699f470f5519c34fda5d (patch) | |
tree | 9cfb8e2c1a816e2f7142d20b79c578fdf69dd2f2 /drivers/hid/hid-multitouch.c | |
parent | a0ca97b808c06793fd9dfb69243ce945c9fff501 (diff) | |
parent | 44549e8f5eea4e0a41b487b63e616cb089922b99 (diff) | |
download | linux-4096e645d85d575e7b6e699f470f5519c34fda5d.tar.bz2 |
Merge 4.6-rc7 into staging-next
This fixes some merge issues with some iio drivers that were found in
linux-next.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hid/hid-multitouch.c')
-rw-r--r-- | drivers/hid/hid-multitouch.c | 1 |
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); } } |