summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2010-07-22 10:51:54 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2010-07-22 10:57:34 +1000
commite0e4b7d89b20ab9997a2eeb17dc7381ecafa31e3 (patch)
tree493a99d0eafa3489d27c59aaed776c4383c7ab2c
parentd2c11d36a05e18936e39f7aa592c15b254aff1de (diff)
Move private init down.
No real change, preparation for new input API. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/evdev.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/evdev.c b/src/evdev.c
index bcc72bd..e90eaed 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -2063,14 +2063,14 @@ EvdevPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
pInfo->conf_idev = dev;
pInfo->private = NULL;
+ xf86CollectInputOptions(pInfo, evdevDefaults, NULL);
+ xf86ProcessCommonOptions(pInfo, pInfo->options);
+
if (!(pEvdev = calloc(sizeof(EvdevRec), 1)))
goto error;
pInfo->private = pEvdev;
- xf86CollectInputOptions(pInfo, evdevDefaults, NULL);
- xf86ProcessCommonOptions(pInfo, pInfo->options);
-
if (!EvdevOpenDevice(pInfo))
goto error;