diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 6eaaf4231635b572459cb4e3aa581b339313ce19..606e4a083337913e45f2f584706de2c7864e84c7 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -447,6 +447,13 @@ static int pci_device_remove(struct device *dev)
 	if (drv) {
 		if (drv->remove) {
 			pm_runtime_get_sync(dev);
+			/*
+			 * If the driver provides a .runtime_idle() callback and it has
+			 * started to run already, it may continue to run in parallel
+			 * with the code below, so wait until all of the runtime PM
+			 * activity has completed.
+			 */
+			pm_runtime_barrier(dev);
 			drv->remove(pci_dev);
 			pm_runtime_put_noidle(dev);
 		}