summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/synaptics.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/synaptics.c b/src/synaptics.c
index d036bdf..a8e9063 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -258,6 +258,13 @@ SetDeviceAndProtocol(InputInfoPtr pInfo)
proto = xf86SetStrOption(pInfo->options, "Protocol", NULL);
device = xf86SetStrOption(pInfo->options, "Device", NULL);
+
+ /* If proto is auto-dev, unset and let the code do the rest */
+ if (proto && !strcmp(proto, "auto-dev")) {
+ free(proto);
+ proto = NULL;
+ }
+
for (i = 0; protocols[i].name; i++) {
if ((!device || !proto) &&
protocols[i].proto_ops->AutoDevProbe &&