summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2013-03-05 09:41:47 +1000
committerJason Gerecke <killertofu@gmail.com>2013-03-05 15:47:28 -0800
commit1bca5eefa22afcce1ebe33812e7d17872ceeafca (patch)
treefe38c2e00630a65d42a7cded66ef15da102f1ff1
parentab53739dafee0e0f4a534220501bd067193ff109 (diff)
downloadxf86-input-wacom-1bca5eefa22afcce1ebe33812e7d17872ceeafca.tar.gz
Handle DEVICE_ABORT on input ABI 19.1
And do nothing. USB devices are handled by the kernel, so we don't need to reset the HW. ISDV4 devices don't get reset on normal shutdown anyway, so we don't need to do anything here either. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/xf86Wacom.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/xf86Wacom.c b/src/xf86Wacom.c
index 4d38bb3..2a44f11 100644
--- a/src/xf86Wacom.c
+++ b/src/xf86Wacom.c
@@ -858,7 +858,10 @@ static int wcmDevProc(DeviceIntPtr pWcm, int what)
}
pWcm->public.on = FALSE;
break;
-
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) * 100 + GET_ABI_MINOR(ABI_XINPUT_VERSION) >= 1901
+ case DEVICE_ABORT:
+ break;
+#endif
default:
xf86Msg(X_ERROR, "%s: invalid mode=%d. This is an X server bug.\n",
pInfo->name, what);