summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-08-11 09:40:16 +0200
committerTakashi Iwai <tiwai@suse.de>2015-08-11 09:40:16 +0200
commit41450b1b5ba101bf470b4fdf0407b30696e86bd3 (patch)
tree6d42fc8d3afc7770d8cc0c64ad92fd0835a82c1f /tools
parentfe14f39e88c8ac16d0a051f8444a2294f8cb358c (diff)
parent6ac7ada210a8d23a56fbf18b6e1e00528844565c (diff)
Merge branch 'for-linus' into for-next
Diffstat (limited to 'tools')
-rw-r--r--tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c b/tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c
index 7f0c756993af..3d7dc6afc3f8 100644
--- a/tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c
+++ b/tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c
@@ -191,7 +191,7 @@ int main(int argc, char *argv[])
if (res > 0) {
atomic_set(&requeued, 1);
break;
- } else if (res > 0) {
+ } else if (res < 0) {
error("FUTEX_CMP_REQUEUE_PI failed\n", errno);
ret = RET_ERROR;
break;