---

yaml
---
r: 322541
b: refs/heads/master
c: ea8c88f
h: refs/heads/master
i:
  322539: bc983af
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f9c1397e2e80e52b17ec4e39760caa807bd15c7
+refs/heads/master: ea8c88f13d9fb1d6b39a05bfa07ae076ca1c6803

trunk/drivers/pci/pci-driver.c

@@ -280,8 +280,12 @@ static long local_pci_probe(void *_ddi)
 {
 	struct drv_dev_and_id *ddi = _ddi;
 	struct device *dev = &ddi->dev->dev;
+	struct device *parent = dev->parent;
 	int rc;
 
+	/* The parent bridge must be in active state when probing */
+	if (parent)
+		pm_runtime_get_sync(parent);
 	/* Unbound PCI devices are always set to disabled and suspended.
 	 * During probe, the device is set to enabled and active and the
 	 * usage count is incremented.  If the driver supports runtime PM,
@@ -298,6 +302,8 @@ static long local_pci_probe(void *_ddi)
 		pm_runtime_set_suspended(dev);
 		pm_runtime_put_noidle(dev);
 	}
+	if (parent)
+		pm_runtime_put(parent);
 	return rc;
 }