summaryrefslogtreecommitdiff
path: root/hw/xfree86/common/xf86Xinput.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2011-07-29 14:58:58 -0700
committerKeith Packard <keithp@keithp.com>2011-07-29 14:58:58 -0700
commitb8f61c11c94708d4f17720a55945dee4621315a4 (patch)
treeb44b17c5b88cd45070d31c15c02f5e876d671dc1 /hw/xfree86/common/xf86Xinput.c
parent5596f10cce58295d8af73646352b314ecb3ddfca (diff)
parentf51e42f583073bde0bc8131887cb7220636c8855 (diff)
Merge remote-tracking branch 'whot/for-keith'
Diffstat (limited to 'hw/xfree86/common/xf86Xinput.c')
-rw-r--r--hw/xfree86/common/xf86Xinput.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index 26051ad7f..d22fdc8b9 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -844,6 +844,7 @@ xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL enable)
{
OsReleaseSignals();
xf86Msg(X_ERROR, "Couldn't init device \"%s\"\n", pInfo->name);
+ RemoveDevice(dev, TRUE);
rval = BadMatch;
goto unwind;
}