summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2010-09-22 21:44:13 +0200
committerPeter Hutterer <peter.hutterer@who-t.net>2010-10-05 14:28:23 +1000
commitf2039cb7fba41032ec87315a3a4511472a5ef0dc (patch)
tree66faf8f6bbebb4c46a0018592483978d234280de
parent6f7daad930bbceb98a3bea537446b457a5f76246 (diff)
config: collect options during preinit
This must to ensure that the "Device" option is set correctly before SetDeviceAndProtocol is called, but it's only needed when the old input API is used. Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/synaptics.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/synaptics.c b/src/synaptics.c
index eae48d2..57b463c 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -674,6 +674,8 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
pInfo->conf_idev = dev;
pInfo->always_core_feedback = 0;
+ xf86CollectInputOptions(pInfo, NULL, NULL);
+
if (NewSynapticsPreInit(drv, pInfo, flags) != Success)
return NULL;