diff options
author | Peter Hutterer <peter.hutterer@who-t.net> | 2008-12-08 12:12:39 +1000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2008-12-08 13:46:12 +1000 |
commit | 39db182b637041255ed6dac739ff77c8e4e07c30 (patch) | |
tree | ea4cad8d33f91bdbe1ee9a9bb21d5936e0dfd671 | |
parent | 78a62d7713c708d067d8824ec41b0a0225c1997f (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.c | 4 |
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 @@ -1312,25 +1312,25 @@ InitInput(argc, argv) { IDevPtr* pDev; DeviceIntPtr dev; 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 */ if (!xf86NameCmp((*pDev)->driver, "keyboard")) { strcpy((*pDev)->driver, "kbd"); } /* If one fails, the others will too */ if (xf86NewInputDevice(*pDev, &dev, TRUE) == BadAlloc) break; } - - mieqInit(); } /* * OsVendorInit -- * OS/Vendor-specific initialisations. Called from OsInit(), which * is called by dix before establishing the well known sockets. |