[PCI] pci-6 - Fix scanning of non-zero functions

Fix breakage in pci-3 - we scanned all functions if function 0 was not
present.  This causes some host bridges to lock up when scanning devfn
255 on PPC machines.

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 1c66d319f420e73fc51ad8791a9c272ae7d62c88..2715583870db46caaccb1e13f4acdd60945bfe1e 100644 (file)
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -520,11 +520,14 @@ int __devinit pci_scan_slot(struct pci_bus *bus, int devfn)
                struct pci_dev *dev;
 
                dev = pci_scan_device(bus, devfn);
-               if (!dev)
-                       continue;
-
-               if (func != 0)
+               if (func == 0) {
+                       if (!dev)
+                               break;
+               } else {
+                       if (!dev)
+                               continue;
                        dev->multifunction = 1;
+               }
 
                /* Fix up broken headers */
                pci_fixup_device(PCI_FIXUP_HEADER, dev);