diff options
| author | Peter Osterlund <petero2@telia.com> | 2005-06-26 00:29:36 +0200 |
|---|---|---|
| committer | Peter Osterlund <petero2@telia.com> | 2006-04-09 04:03:24 +0200 |
| commit | 4ced6a79c5a594937f7b33a9cd8d4cb80b90426a (patch) | |
| tree | d6b1bccedec5af1e403164cedf12308a6ff12724 | |
| parent | 2da0af084657eaed1eb25e817e763de0636a55c3 (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.
| -rw-r--r-- | synaptics.c | 4 |
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; } |