diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-28 10:22:00 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-28 10:22:00 +0300 |
| commit | 83b21ed0fc2a7b17c6b9d4f72f664841f797380b (patch) | |
| tree | 99272c0f69b8d762bf82400e6bdb84146b5baadb /tools/testing/selftests/bpf/test_tcpbpf_user.c | |
| parent | c3fee60908db4a8594f2e4a2131998384b8fa006 (diff) | |
| parent | f17b5f06cb92ef2250513a1e154c47b78df07d40 (diff) | |
| download | linux-83b21ed0fc2a7b17c6b9d4f72f664841f797380b.tar.xz | |
Merge 5.0-rc4 into tty-next
We need the tty and serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/testing/selftests/bpf/test_tcpbpf_user.c')
| -rw-r--r-- | tools/testing/selftests/bpf/test_tcpbpf_user.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/bpf/test_tcpbpf_user.c b/tools/testing/selftests/bpf/test_tcpbpf_user.c index e6eebda7d112..716b4e3be581 100644 --- a/tools/testing/selftests/bpf/test_tcpbpf_user.c +++ b/tools/testing/selftests/bpf/test_tcpbpf_user.c @@ -103,7 +103,7 @@ int main(int argc, char **argv) goto err; cg_fd = create_and_get_cgroup(cg_path); - if (!cg_fd) + if (cg_fd < 0) goto err; if (join_cgroup(cg_path)) |