Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2931dc7d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v4.13-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci 

Pull PCI fixes from Bjorn Helgaas:

 - fix a typo that broke Rockchip enumeration

 - fix a new memory leak in the ARM host bridge failure path

* tag 'pci-v4.13-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: rockchip: Check for pci_scan_root_bus_bridge() failure correctly
  ARM/PCI: Fix pcibios_init_resource() struct pci_host_bridge leak
parents d3c329c7 34d5ac2a

arch/arm/kernel/bios32.c

+1 −1
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw, 


			ret = pcibios_init_resource(nr, sys, hw->io_optional);

			if (ret)  {

				kfree(sys);

				pci_free_host_bridge(bridge);

				break;

			}

drivers/pci/host/pcie-rockchip.c

+1 −1
Original line number Diff line number Diff line
@@ -1483,7 +1483,7 @@ static int rockchip_pcie_probe(struct platform_device *pdev) 
	bridge->swizzle_irq = pci_common_swizzle;



	err = pci_scan_root_bus_bridge(bridge);

	if (!err)

	if (err < 0)

		goto err_free_res;



	bus = bridge->bus;