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

Pull PCI updates from Bjorn Helgaas:
 "These are fixes for a powerpc NULL pointer dereference, an OF
  interrupt mapping issue on some of the new host bridges, and a
  DesignWare iATU issue.

  Host bridge drivers
   - Fix OF interrupt mapping for DesignWare, R-Car, Tegra (Lucas Stach)
   - Fix DesignWare iATU programming (Mohit Kumar)

  Miscellaneous
    - Fix powerpc NULL dereference from list_for_each_entry() update (Mike Qiu)"

* tag 'pci-v3.15-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: tegra: Use new OF interrupt mapping when possible
  PCI: rcar: Use new OF interrupt mapping when possible
  PCI: designware: Use new OF interrupt mapping when possible
  PCI: designware: Fix iATU programming for cfg1, io and mem viewport
  PCI: designware: Fix comment for setting number of lanes
  powerpc/PCI: Fix NULL dereference in sys_pciconfig_iobase() list traversal

1 files changed, 6 insertions, 4 deletions

diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 2a4779091a58..155013da27e0 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -208,7 +208,7 @@ long sys_pciconfig_iobase(long which, unsigned long in_bus,
                           unsigned long in_devfn)
 {
         struct pci_controller* hose;
-        struct pci_bus *bus = NULL;
+        struct pci_bus *tmp_bus, *bus = NULL;
         struct device_node *hose_node;
 
         /* Argh ! Please forgive me for that hack, but that's the
@@ -229,10 +229,12 @@ long sys_pciconfig_iobase(long which, unsigned long in_bus,
          * used on pre-domains setup. We return the first match
          */
 
-        list_for_each_entry(bus, &pci_root_buses, node) {
-                if (in_bus >= bus->number && in_bus <= bus->busn_res.end)
+        list_for_each_entry(tmp_bus, &pci_root_buses, node) {
+                if (in_bus >= tmp_bus->number &&
+                    in_bus <= tmp_bus->busn_res.end) {
+                        bus = tmp_bus;
                         break;
-                bus = NULL;
+                }
         }
         if (bus == NULL || bus->dev.of_node == NULL)
                 return -ENODEV;