|
@@ -182,9 +182,15 @@ static int amba_probe(struct device *dev)
|
|
|
int ret;
|
|
|
|
|
|
do {
|
|
|
+ ret = dev_pm_domain_attach(dev, true);
|
|
|
+ if (ret == -EPROBE_DEFER)
|
|
|
+ break;
|
|
|
+
|
|
|
ret = amba_get_enable_pclk(pcdev);
|
|
|
- if (ret)
|
|
|
+ if (ret) {
|
|
|
+ dev_pm_domain_detach(dev, true);
|
|
|
break;
|
|
|
+ }
|
|
|
|
|
|
pm_runtime_get_noresume(dev);
|
|
|
pm_runtime_set_active(dev);
|
|
@@ -199,6 +205,7 @@ static int amba_probe(struct device *dev)
|
|
|
pm_runtime_put_noidle(dev);
|
|
|
|
|
|
amba_put_disable_pclk(pcdev);
|
|
|
+ dev_pm_domain_detach(dev, true);
|
|
|
} while (0);
|
|
|
|
|
|
return ret;
|
|
@@ -220,6 +227,7 @@ static int amba_remove(struct device *dev)
|
|
|
pm_runtime_put_noidle(dev);
|
|
|
|
|
|
amba_put_disable_pclk(pcdev);
|
|
|
+ dev_pm_domain_detach(dev, true);
|
|
|
|
|
|
return ret;
|
|
|
}
|