redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

pci-v4.13-fixes-1

Browse source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJZZ+9mAAoJEFmIoMA60/r8q6sP/jyP0rmryX9VJM5Q/LSJffsw
 7J9euvkEZ07pAl6lhO4AAjvAP78XOnXzJCD4XyIQtIVBR6wkcfhJl8NLtfd/Pt3H
 Ri5X8l/ZXthA6U3Ya5Sn/LNwsNghRvvulWLVw1HZjaBvioSwdUty7VXicI6vGe+/
 F+r7ealZPVrglMk74JyHN7GS21OqG7f5GjsF1RlE6kgmKeqqB/0b4jQeK8s6CuVj
 UXu0zJOciKpHlR68M4qSLUFWCBPBXFTHLCAmilqpIzQRZN98sLLk3r9RuB38peMb
 ix7egDn6bi9Hf8lAvpkHwW6GiBKLJIBbfqdFlo8P03MNQHheMOdHzn3RTe8sQ6gh
 mP3MfezwmULd/DleOwKVpUvZDBEETXTb+f6pm8ueyANnNK7/HmtxVswz+qC+trpe
 30Ed4HApVT0xU0sYB5wMUmrpAaLTJuoIk4Zjtc5mFVOM1fGlTyXQzElrvy09oEZz
 PfIKHOY9ky5IPAoB8BMME+f/R8FrssEJ02qEu+0G8k+P9tkFmkT8uZQntl82a5ac
 Lxjfx7eZamWhVRHXMQQBv0tzJYNpbSeoiJBKhtDk5i51NJW9FE+Yi9z/C/0SsxJ7
 ehRRJ8r+DzVWQHaLguraogrWq41T7xRu8OnTiFKdgHCrlvKur+P2GKLzU+VUxoWv
 94XbFFAPfXtJwwwER7AY
 =FGpw
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2017-07-14 12:36:20 -07:00
parent d3c329c741 34d5ac2af6
commit 2931dc7d9d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/kernel/bios32.c
View file

@ -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;
}

2
drivers/pci/host/pcie-rockchip.c
View file

@ -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;