diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-03-03 15:27:20 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-07-18 15:01:07 +1000 |
| commit | 12c7ac3ac13e1b0204b58e3791611dc263c7ac90 (patch) | |
| tree | bfcaee8399043ca7c21fd2f6a230c8d6390d28ed | |
| parent | 7246720a339199c7779385266c182ee6824aac1d (diff) | |
| download | xf86-input-wacom-12c7ac3ac13e1b0204b58e3791611dc263c7ac90.tar.gz | |
Don't manually UnInit the devices for ABI 12
One of the changes going into ABI 12 were that the server calls Uninit even
on driver-hotplugged devices.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Ping Cheng <pinglinux@gmail.com>
(cherry picked from commit 490e345f9d85a73263e96ba0b2918a9a2ca913ad)
| -rw-r--r-- | src/wcmConfig.c | 3 |
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; |