summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/wcmConfig.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/wcmConfig.c b/src/wcmConfig.c
index 70614fe..3c183f0 100644
--- a/src/wcmConfig.c
+++ b/src/wcmConfig.c
@@ -239,6 +239,8 @@ static void wcmUninit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
DBG(1, priv, "\n");
+ /* Server 1.10 will UnInit all devices for us */
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
if (priv->isParent)
{
/* HAL removal sees the parent device removed first. */
@@ -260,6 +262,7 @@ static void wcmUninit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
dev = next;
}
}
+#endif
prev = &priv->common->wcmDevices;
dev = *prev;