summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver McFadden <oliver.mcfadden@nokia.com>2010-04-20 06:59:58 +0300
committerOliver McFadden <oliver.mcfadden@nokia.com>2010-04-20 09:12:43 +0300
commit5fb1e841eb26f6223504e46dacfc40c2e510f72d (patch)
tree231a75b99919fd65229fff70c62fe052f59f34f5
parenta4f2d12cd8fbd19d13a184c45817d7539cb7e3be (diff)
evdev: EvdevProbe: check ioctl() return value and warn on failure.
Called function "ioctl" whose return value should be checked (checked 10 out of 11 times) Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/evdev.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/evdev.c b/src/evdev.c
index 6992c68..ccea90d 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1782,8 +1782,9 @@ EvdevProbe(InputInfoPtr pInfo)
xf86Msg(X_ERROR, "Grab failed. Device already configured?\n");
return 1;
}
- } else if (pEvdev->grabDevice) {
- ioctl(pInfo->fd, EVIOCGRAB, (void *)0);
+ } else if (pEvdev->grabDevice && ioctl(pInfo->fd, EVIOCGRAB, (void *)0)) {
+ xf86Msg(X_WARNING, "%s: Release failed (%s)\n", pInfo->name,
+ strerror(errno));
}
/* Trinary state for ignoring axes: