diff --git a/drivers/pci/pwrctrl/core.c b/drivers/pci/pwrctrl/core.c
index c14df117ece3..0e2387cf4657 100644
--- a/drivers/pci/pwrctrl/core.c
+++ b/drivers/pci/pwrctrl/core.c
@@ -252,14 +252,16 @@ static int __pci_pwrctrl_power_on_device(struct device *dev)
 static int pci_pwrctrl_power_on_device(struct device_node *np)
 {
 	struct platform_device *pdev;
+	struct device_node *child;
 	int ret = 0;
 
-	for_each_available_child_of_node_scoped(np, child) {
+	for_each_available_child_of_node(np, child) {
 		ret = pci_pwrctrl_power_on_device(child);
 		if (ret)
-			return ret;
+			goto err_power_off;
 	}
 
+	child = NULL;
 	if (!pci_pwrctrl_is_required(np))
 		return 0;
 
@@ -279,6 +281,19 @@ static int pci_pwrctrl_power_on_device(struct device_node *np)
 
 	platform_device_put(pdev);
 
+	if (ret)
+		goto err_power_off;
+
+	return 0;
+
+err_power_off:
+	for_each_available_child_of_node_scoped(np, tmp) {
+		if (tmp == child)
+			break;
+		pci_pwrctrl_power_off_device(tmp);
+	}
+	of_node_put(child);
+
 	return ret;
 }