summaryrefslogtreecommitdiff
path: root/synaptics.c
diff options
context:
space:
mode:
authorPeter Osterlund <petero2@telia.com>2005-06-26 00:29:36 +0200
committerPeter Osterlund <petero2@telia.com>2006-04-09 04:03:24 +0200
commit4ced6a79c5a594937f7b33a9cd8d4cb80b90426a (patch)
treed6b1bccedec5af1e403164cedf12308a6ff12724 /synaptics.c
parent2da0af084657eaed1eb25e817e763de0636a55c3 (diff)
In the DeviceOn() function, if opening the device node
fails, try to auto-detect the correct event device again. This can fix problems which occurs after a suspend/resume cycle or after rmmod/insmod-ing the psmouse kernel driver.
Diffstat (limited to 'synaptics.c')
-rw-r--r--synaptics.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/synaptics.c b/synaptics.c
index 73ed7b7..66c8b41 100644
--- a/synaptics.c
+++ b/synaptics.c
@@ -524,6 +524,10 @@ DeviceOn(DeviceIntPtr dev)
local->fd = xf86OpenSerial(local->options);
if (local->fd == -1) {
+ SetDeviceAndProtocol(local);
+ local->fd = xf86OpenSerial(local->options);
+ }
+ if (local->fd == -1) {
xf86Msg(X_WARNING, "%s: cannot open input device\n", local->name);
return !Success;
}