Server calls it before PreInit().
Signed-off-by: Peter Hutterer <[email protected]>
---
src/wcmConfig.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/wcmConfig.c b/src/wcmConfig.c
index 1b93f08..7aaaf6a 100644
--- a/src/wcmConfig.c
+++ b/src/wcmConfig.c
@@ -442,6 +442,7 @@ static InputInfoPtr wcmPreInit(InputDriverPtr drv, IDevPtr
dev, int flags)
* phase is based on those values.
*/
xf86CollectInputOptions(pInfo, (const char**)default_options, NULL);
+ xf86ProcessCommonOptions(pInfo, pInfo->options);
if (NewWcmPreInit(drv, pInfo, flags) == Success) {
pInfo->flags |= XI86_CONFIGURED;
@@ -525,8 +526,6 @@ static int wcmPreInit(InputDriverPtr drv, InputInfoPtr
pInfo, int flags)
if (!wcmSetType(pInfo, type))
goto SetupProc_fail;
- /* Process the common options. */
- xf86ProcessCommonOptions(pInfo, pInfo->options);
if (!wcmParseOptions(pInfo, need_hotplug))
goto SetupProc_fail;
--
1.7.3.3
------------------------------------------------------------------------------
Oracle to DB2 Conversion Guide: Learn learn about native support for PL/SQL,
new data types, scalar functions, improved concurrency, built-in packages,
OCI, SQL*Plus, data movement tools, best practices and more.
http://p.sf.net/sfu/oracle-sfdev2dev
_______________________________________________
Linuxwacom-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
