summaryrefslogtreecommitdiff
path: root/tools/lib
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2024-06-23 02:03:15 +0300
committerMark Brown <broonie@kernel.org>2024-06-23 02:03:15 +0300
commit7bbb71150e57875126efacc2efdc678e3cede919 (patch)
tree98214ae416931f4ff0fdf3aca0b99dc6afc72b28 /tools/lib
parentffe4b381e2ea97c7a5868dbe841c7522b1b0b408 (diff)
parent6ba59ff4227927d3a8530fc2973b80e94b54d58f (diff)
downloadlinux-7bbb71150e57875126efacc2efdc678e3cede919.tar.xz
regulator: Merge up v6.10-rc4
There are fixes for kselftest with clang that really help my CI.
Diffstat (limited to 'tools/lib')
-rw-r--r--tools/lib/bpf/features.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/lib/bpf/features.c b/tools/lib/bpf/features.c
index 3df0125ed5fa..50befe125ddc 100644
--- a/tools/lib/bpf/features.c
+++ b/tools/lib/bpf/features.c
@@ -393,7 +393,8 @@ static int probe_uprobe_multi_link(int token_fd)
err = -errno; /* close() can clobber errno */
if (link_fd >= 0 || err != -EBADF) {
- close(link_fd);
+ if (link_fd >= 0)
+ close(link_fd);
close(prog_fd);
return 0;
}