[PATCHv2 synaptic 1/2] config: collect options during preinit

[Giuseppe Bilotta]

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 at gmail.com>
---
 src/synaptics.c |    2 ++
 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;
 
-- 
1.7.3.rc1.230.gdf48043