summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@canonical.com>2011-01-05 10:09:55 -0500
committerPeter Hutterer <peter.hutterer@who-t.net>2011-01-06 08:35:27 +1000
commit3b52fe2ea4a934a8d87aacd185593beb01f8f273 (patch)
tree0ad5b7f594d0a89c29ffdd1dd440637c176c4c9e
parent540a4cce9071fce183c941ded35e7e8fb8f3507e (diff)
Print out error messages when failing to init devices
Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/evdev.c20
1 files changed, 16 insertions, 4 deletions
diff --git a/src/evdev.c b/src/evdev.c
index d47b6c2..45873c1 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1320,8 +1320,11 @@ EvdevAddAbsClass(DeviceIntPtr device)
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
GetMotionHistory,
#endif
- GetMotionHistorySize(), Absolute))
+ GetMotionHistorySize(), Absolute)) {
+ xf86Msg(X_ERROR, "%s: failed to initialize valuator class device.\n",
+ device->name);
return !Success;
+ }
for (axis = ABS_X; axis <= ABS_MAX; axis++) {
int axnum = pEvdev->axis_map[axis];
@@ -1365,8 +1368,11 @@ EvdevAddAbsClass(DeviceIntPtr device)
}
}
- if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc))
+ if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc)) {
+ xf86Msg(X_ERROR, "%s: failed to initialize pointer feedback class "
+ "device.\n", device->name);
return !Success;
+ }
if (pEvdev->flags & EVDEV_TOUCHPAD)
pEvdev->flags |= EVDEV_RELATIVE_MODE;
@@ -1449,11 +1455,17 @@ EvdevAddRelClass(DeviceIntPtr device)
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
GetMotionHistory,
#endif
- GetMotionHistorySize(), Relative))
+ GetMotionHistorySize(), Relative)) {
+ xf86Msg(X_ERROR, "%s: failed to initialize valuator class device.\n",
+ device->name);
return !Success;
+ }
- if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc))
+ if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc)) {
+ xf86Msg(X_ERROR, "%s: failed to initialize pointer feedback class "
+ "device.\n", device->name);
return !Success;
+ }
for (axis = REL_X; axis <= REL_MAX; axis++)
{