diff options
| author | Alexandr Shadchin <shadchin@cvs.openbsd.org> | 2012-06-12 17:10:04 +0000 |
|---|---|---|
| committer | Alexandr Shadchin <shadchin@cvs.openbsd.org> | 2012-06-12 17:10:04 +0000 |
| commit | 4f7ccf2ca0cb137cdb792b7dd4dbd1537b0b423f (patch) | |
| tree | 74ec93fad8689c5561bd352cfe5a0e147bbdd082 /driver | |
| parent | e227718749d94b39e416c11c187ce6db79fbc09d (diff) | |
Add missing XISetDevicePropertyDeletable and more information about error
ok matthieu@
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/xf86-input-ws/src/ws.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/driver/xf86-input-ws/src/ws.c b/driver/xf86-input-ws/src/ws.c index ef29032bf..fded40f38 100644 --- a/driver/xf86-input-ws/src/ws.c +++ b/driver/xf86-input-ws/src/ws.c @@ -13,7 +13,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $OpenBSD: ws.c,v 1.52 2012/06/12 17:04:43 shadchin Exp $ */ +/* $OpenBSD: ws.c,v 1.53 2012/06/12 17:10:03 shadchin Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -670,17 +670,25 @@ wsInitCalibProperty(DeviceIntPtr device) strlen(WS_PROP_CALIBRATION), TRUE); rc = XIChangeDeviceProperty(device, prop_calibration, XA_INTEGER, 32, PropModeReplace, 4, &priv->min_x, FALSE); - if (rc != Success) + if (rc != Success) { + xf86IDrvMsg(pInfo, X_ERROR, + "cannot create device property %s: %d\n", + WS_PROP_CALIBRATION, rc); return; - + } XISetDevicePropertyDeletable(device, prop_calibration, FALSE); prop_swap = MakeAtom(WS_PROP_SWAP_AXES, strlen(WS_PROP_SWAP_AXES), TRUE); rc = XIChangeDeviceProperty(device, prop_swap, XA_INTEGER, 8, PropModeReplace, 1, &priv->swap_axes, FALSE); - if (rc != Success) + if (rc != Success) { + xf86IDrvMsg(pInfo, X_ERROR, + "cannot create device property %s: %d\n", + WS_PROP_SWAP_AXES, rc); return; + } + XISetDevicePropertyDeletable(device, prop_swap, FALSE); XIRegisterPropertyHandler(device, wsSetCalibProperty, NULL, NULL); |