summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2019-11-28 17:54:54 +0300
committerBjorn Helgaas <bhelgaas@google.com>2019-11-28 17:54:54 +0300
commit48617f03c94088780c86692593b0a9b10f74530f (patch)
tree9e88fc6154a77b5d6871dd4ebc494b7a06c20fe9 /tools
parent7bd4c4a7b0ff94ef01247f905cd568fb67c747e0 (diff)
parent3c379a59b4795d7279d38c623e74b9790345a32b (diff)
downloadlinux-48617f03c94088780c86692593b0a9b10f74530f.tar.xz
Merge branch 'remotes/lorenzo/pci/misc'
- Fix iproc-msi and mvebu __iomem annotations (Ben Dooks) - Make mvebu_pci_bridge_emul_ops static (Ben Dooks) - Add Marek Vasut and Yoshihiro Shimoda as R-Car maintainers (Simon Horman) - Fix pcitest.c fd leak (Hewenliang) * remotes/lorenzo/pci/misc: tools: PCI: Fix fd leakage MAINTAINERS: Add Marek and Shimoda-san as R-Car PCIE co-maintainers PCI: mvebu: mvebu_pcie_map_registers __iomem fix PCI: mvebu: Make mvebu_pci_bridge_emul_ops static PCI: iproc-msi: Fix __iomem annotation in decode_msi_hwirq()
Diffstat (limited to 'tools')
-rw-r--r--tools/pci/pcitest.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/pci/pcitest.c b/tools/pci/pcitest.c
index cb1e51fcc84e..32b7c6f9043d 100644
--- a/tools/pci/pcitest.c
+++ b/tools/pci/pcitest.c
@@ -129,6 +129,7 @@ static int run_test(struct pci_test *test)
}
fflush(stdout);
+ close(fd);
return (ret < 0) ? ret : 1 - ret; /* return 0 if test succeeded */
}