diff options
author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-09-16 17:32:13 -0500 |
---|---|---|
committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-09-19 19:27:35 -0700 |
commit | 36a568738f3032f61215b6f96dc736777f70fb9a (patch) | |
tree | 52851c06d023af49f9dbf779f0d4f271ed5a8f17 | |
parent | 0071e4b6593c155ce0e59d2bfb9397726475f5f8 (diff) |
Don't ignore errors in NestedInputControl
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
-rw-r--r-- | src/input.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/input.c b/src/input.c index 1286d08..025e373 100644 --- a/src/input.c +++ b/src/input.c @@ -198,13 +198,23 @@ nested_input_on(OsTimerPtr timer, CARD32 time, pointer arg) { static int NestedInputControl(DeviceIntPtr device, int what) { + int err; InputInfoPtr pInfo = device->public.devicePrivate; switch (what) { case DEVICE_INIT: - _nested_input_init_keyboard(device); - _nested_input_init_buttons(device); - _nested_input_init_axes(device); + err = _nested_input_init_keyboard(device); + if (err != Success) + return err; + + err = _nested_input_init_buttons(device); + if (err != Success) + return err; + + err = _nested_input_init_axes(device); + if (err != Success) + return err; + break; case DEVICE_ON: xf86Msg(X_INFO, "%s: On.\n", pInfo->name); |