diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-10 09:07:25 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-10 09:07:25 -0700 |
| commit | f70d6318320983a8d2fac28cfe8d22dfd5e52a73 (patch) | |
| tree | e3a427a3abeca491007f036b09be84944657f58e /tools | |
| parent | b963e7223cb3278dda35a6550a8df08ff2be2ee5 (diff) | |
| parent | f7644cbfcdf03528f0f450f3940c4985b2291f49 (diff) | |
| download | blackbird-obmc-linux-f70d6318320983a8d2fac28cfe8d22dfd5e52a73.tar.gz blackbird-obmc-linux-f70d6318320983a8d2fac28cfe8d22dfd5e52a73.zip | |
Merge 4.2-rc6 into staging-next
We want the IIO and staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c | 2 |
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; |
