diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2017-02-24 14:11:35 +1000 |
|---|---|---|
| committer | Jason Gerecke <killertofu@gmail.com> | 2017-02-24 15:19:21 -0800 |
| commit | de650d6224b353ee5596f5ce65de8059db5cd289 (patch) | |
| tree | 32be3cd28e149c646aa0f05f12638241eaa65502 | |
| parent | f65d97362813ea89d18e5049ad87bc468ec30f85 (diff) | |
| download | xf86-input-wacom-de650d6224b353ee5596f5ce65de8059db5cd289.tar.gz | |
Cancel timers on DEVICE_OFF
Otherwise we run the risk of having a timer trigger after we removed the
device. Since we pass InputInfoPtrs and WacomDevicePtrs to the timers as
arguments, these may have been freed by the time a timer triggers.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Jason Gerecke <jason.gerecke@wacom.com>
| -rw-r--r-- | src/xf86Wacom.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/xf86Wacom.c b/src/xf86Wacom.c index b4cf25b..26b4e9c 100644 --- a/src/xf86Wacom.c +++ b/src/xf86Wacom.c @@ -854,6 +854,9 @@ static int wcmDevProc(DeviceIntPtr pWcm, int what) break; case DEVICE_OFF: + TimerCancel(priv->tap_timer); + TimerCancel(priv->serial_timer); + TimerCancel(priv->touch_timer); wcmDisableTool(pWcm); wcmUnlinkTouchAndPen(pInfo); if (pInfo->fd >= 0) |