Merge tag 'pci-v3.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[mirror_ubuntu-artful-kernel.git] / drivers / pci / hotplug / acpiphp_glue.c

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 828acf422c17eca4fe02cab5feca62e41e50908e..bccc27ee10308f4d1ec388db248d1af1ab08aaba 100644 (file)
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -424,7 +424,7 @@ static void cleanup_bridge(struct acpiphp_bridge *bridge)
  */
 static unsigned char acpiphp_max_busnr(struct pci_bus *bus)
 {
-       struct list_head *tmp;
+       struct pci_bus *tmp;
        unsigned char max, n;
 
        /*
@@ -437,8 +437,8 @@ static unsigned char acpiphp_max_busnr(struct pci_bus *bus)
         */
        max = bus->busn_res.start;
 
-       list_for_each(tmp, &bus->children) {
-               n = pci_bus_max_busnr(pci_bus_b(tmp));
+       list_for_each_entry(tmp, &bus->children, node) {
+               n = pci_bus_max_busnr(tmp);
                if (n > max)
                        max = n;
        }