On Wed, Jan 05, 2011 at 10:09:55AM -0500, Chase Douglas wrote: > Signed-off-by: Chase Douglas <[email protected]> > --- > src/evdev.c | 20 ++++++++++++++++---- > 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++) > { > -- > 1.7.2.3
merged, thanks Cheers, Peter _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
