---

yaml --- r: 200347 b: refs/heads/master c: a7ef7d1 h: refs/heads/master i: 200345: 7209748 200343: d36b63e v: v3
git-mirror · Jun 11, 2010 · 15bdf22 · 15bdf22
1 parent 6300fe8
commit 15bdf22
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3be434f0244ee059432f92de7e891ee514f41738
+refs/heads/master: a7ef7d1f5e898984c479e8c41ca702141bbadc78
diff --git a/trunk/drivers/pci/hotplug/cpqphp_core.c b/trunk/drivers/pci/hotplug/cpqphp_core.c
@@ -828,7 +828,14 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 			pci_name(pdev), err);
 		return err;
 	}
+
 	bus = pdev->subordinate;
+	if (!bus) {
+		dev_notice(&pdev->dev, "the device is not a bridge, "
+				"skipping\n");
+		rc = -ENODEV;
+		goto err_disable_device;
+	}
 
 	/* Need to read VID early b/c it's used to differentiate CPQ and INTC
 	 * discovery