aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx/patches-4.1/031-0002-PCI-iproc-Free-resource-list-after-registration.patch
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2016-01-19 20:58:48 +0000
committerRafał Miłecki <zajec5@gmail.com>2016-01-19 20:58:48 +0000
commit1dfa369c98075302400f46cd2b410d32a5ef68d6 (patch)
tree30bb288628a36c2469bfedec94161e0e63258b27 /target/linux/bcm53xx/patches-4.1/031-0002-PCI-iproc-Free-resource-list-after-registration.patch
parent82939c3f52acd089370de17a4f8e07d453b0bf13 (diff)
downloadupstream-1dfa369c98075302400f46cd2b410d32a5ef68d6.tar.gz
upstream-1dfa369c98075302400f46cd2b410d32a5ef68d6.tar.bz2
upstream-1dfa369c98075302400f46cd2b410d32a5ef68d6.zip
bcm53xx: group iProc patches into patchsets they were sent in
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 48368
Diffstat (limited to 'target/linux/bcm53xx/patches-4.1/031-0002-PCI-iproc-Free-resource-list-after-registration.patch')
-rw-r--r--target/linux/bcm53xx/patches-4.1/031-0002-PCI-iproc-Free-resource-list-after-registration.patch57
1 files changed, 57 insertions, 0 deletions
diff --git a/target/linux/bcm53xx/patches-4.1/031-0002-PCI-iproc-Free-resource-list-after-registration.patch b/target/linux/bcm53xx/patches-4.1/031-0002-PCI-iproc-Free-resource-list-after-registration.patch
new file mode 100644
index 0000000000..bbd3164eb2
--- /dev/null
+++ b/target/linux/bcm53xx/patches-4.1/031-0002-PCI-iproc-Free-resource-list-after-registration.patch
@@ -0,0 +1,57 @@
+From ef07991a95de76b07594448c3521361831ec2cfe Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Sun, 24 May 2015 22:37:03 +0200
+Subject: [PATCH 2/2] PCI: iproc: Free resource list after registration
+
+The resource list is only used in the setup process and was never freed.
+pci_add_resource() allocates a memory area to store the list item.
+
+Fix the memory leak.
+
+Tested-by: Ray Jui <rjui@broadcom.com>
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
+Reviewed-by: Ray Jui <rjui@broadcom.com>
+---
+ drivers/pci/host/pcie-iproc-bcma.c | 8 ++++----
+ drivers/pci/host/pcie-iproc-platform.c | 8 ++++----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+--- a/drivers/pci/host/pcie-iproc-bcma.c
++++ b/drivers/pci/host/pcie-iproc-bcma.c
+@@ -65,12 +65,12 @@ static int iproc_pcie_bcma_probe(struct
+ pcie->map_irq = iproc_pcie_bcma_map_irq;
+
+ ret = iproc_pcie_setup(pcie, &res);
+- if (ret) {
++ if (ret)
+ dev_err(pcie->dev, "PCIe controller setup failed\n");
+- return ret;
+- }
+
+- return 0;
++ pci_free_resource_list(&res);
++
++ return ret;
+ }
+
+ static void iproc_pcie_bcma_remove(struct bcma_device *bdev)
+--- a/drivers/pci/host/pcie-iproc-platform.c
++++ b/drivers/pci/host/pcie-iproc-platform.c
+@@ -72,12 +72,12 @@ static int iproc_pcie_pltfm_probe(struct
+ pcie->map_irq = of_irq_parse_and_map_pci;
+
+ ret = iproc_pcie_setup(pcie, &res);
+- if (ret) {
++ if (ret)
+ dev_err(pcie->dev, "PCIe controller setup failed\n");
+- return ret;
+- }
+
+- return 0;
++ pci_free_resource_list(&res);
++
++ return ret;
+ }
+
+ static int iproc_pcie_pltfm_remove(struct platform_device *pdev)