diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-04-30 16:03:43 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-05-05 10:57:15 +1000 |
| commit | 5456328aea1db9d869fc38d63f1e50f93d1e2dae (patch) | |
| tree | 726e171c78260b0bfde4d731324e1e0af4d53547 | |
| parent | bd0eda4e6396825bbc04095c81eb0955d39e2345 (diff) | |
Only try to free the timer if it's actually there.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Christoph Brill <egore911@egore911.de>
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
(cherry picked from commit 6dc7f5e127b4b60b27f661862c5698e6f9ea7e49)
| -rw-r--r-- | src/synaptics.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/synaptics.c b/src/synaptics.c index 2383c38..6b98e6e 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -636,7 +636,9 @@ static void SynapticsUnInit(InputDriverPtr drv, InputInfoPtr local, int flags) { - xfree(((SynapticsPrivate *)local->private)->timer); + SynapticsPrivate *priv = ((SynapticsPrivate *)local->private); + if (priv && priv->timer) + xfree(priv->timer); xfree(local->private); local->private = NULL; xf86DeleteInput(local, 0); |