pci: fix next_ari_fn scan

Commit Message

Matthew Wilcox Feb. 8, 2010, 7:27 p.m. UTC

None

Patch

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 11824d7..a06887f 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1271,12 +1279,14 @@  int pci_scan_slot(struct pci_bus *bus, int devfn)
 		return 0; /* Already scanned the entire slot */
 
 	dev = pci_scan_single_device(bus, devfn);
-	if (dev && !dev->is_added)	/* new device? */
+	if (!dev)
+		return 0;
+	if (!dev->is_added)
 		nr++;
 
 	if (pci_ari_enabled(bus))
 		next_fn = next_ari_fn;
-	else if (dev && dev->multifunction)
+	else if (dev->multifunction)
 		next_fn = next_trad_fn;
 
 	for (fn = next_fn(dev, 0); fn > 0; fn = next_fn(dev, fn)) {