summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Osterlund <petero2@telia.com>2004-07-27 00:52:36 +0200
committerPeter Osterlund <petero2@telia.com>2006-04-09 04:02:39 +0200
commit53b9941db7b95436f701a9a5bd065a4069ab573f (patch)
treef413d6d3f380027a4ed59cb44c646e64f9c895c1
parentc30e4b8d455d575569fc530377e2aaa88b8dcfcb (diff)
The SynapticsPreInit() function shouldn't call
xf86RemoveEnabledDevice() when it hasn't called xf86AddEnabledDevice() first.
-rw-r--r--synaptics.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/synaptics.c b/synaptics.c
index 54b26f4..ba15065 100644
--- a/synaptics.c
+++ b/synaptics.c
@@ -396,7 +396,6 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
local->flags |= XI86_CONFIGURED;
if (local->fd != -1) {
- xf86RemoveEnabledDevice(local);
if (priv->comm.buffer) {
XisbFree(priv->comm.buffer);
priv->comm.buffer = NULL;
@@ -408,7 +407,6 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
SetupProc_fail:
if (local->fd >= 0) {
- RemoveEnabledDevice(local->fd);
xf86CloseSerial(local->fd);
local->fd = -1;
}