summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2008-12-08 12:12:39 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2008-12-08 13:46:12 +1000
commit39db182b637041255ed6dac739ff77c8e4e07c30 (patch)
treeea4cad8d33f91bdbe1ee9a9bb21d5936e0dfd671
parent78a62d7713c708d067d8824ec41b0a0225c1997f (diff)
xfree86: init EQ before trying to initialise the devices (#18890)
The kbd driver may send events during device initialisation, and these events need the EQ set up already. X.Org Bug 18890 <http://bugs.freedesktop.org/show_bug.cgi?id=18890> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--hw/xfree86/common/xf86Init.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index eacf34449..139340e73 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1315,6 +1315,8 @@ InitInput(argc, argv)
xf86Info.vtRequestsPending = FALSE;
+ mieqInit();
+
/* Call the PreInit function for each input device instance. */
for (pDev = xf86ConfigLayout.inputs; pDev && *pDev; pDev++) {
/* Replace obsolete keyboard driver with kbd */
@@ -1326,8 +1328,6 @@ InitInput(argc, argv)
if (xf86NewInputDevice(*pDev, &dev, TRUE) == BadAlloc)
break;
}
-
- mieqInit();
}
/*