aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2018-04-26 04:53:05 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-05-14 16:58:44 -0400
commitd21bc89eb98cac7a7af6476f41cbdf10f082dd6b (patch)
tree0e398ef97a47cd1ddbd60073cb96fcbe48546fc0
parent919b7308fcc452cd4e282bab389c33384a9f3790 (diff)
amba: Respect all error codes from dev_pm_domain_attach()
The limitation of being able to check only for -EPROBE_DEFER from dev_pm_domain_attach() has been removed. Hence let's respect all error codes and bail out accordingly. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/amba/bus.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index 4a3ac31c07d0..b0160b5c5608 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -248,7 +248,7 @@ static int amba_probe(struct device *dev)
248 break; 248 break;
249 249
250 ret = dev_pm_domain_attach(dev, true); 250 ret = dev_pm_domain_attach(dev, true);
251 if (ret == -EPROBE_DEFER) 251 if (ret)
252 break; 252 break;
253 253
254 ret = amba_get_enable_pclk(pcdev); 254 ret = amba_get_enable_pclk(pcdev);
@@ -375,7 +375,7 @@ static int amba_device_try_add(struct amba_device *dev, struct resource *parent)
375 } 375 }
376 376
377 ret = dev_pm_domain_attach(&dev->dev, true); 377 ret = dev_pm_domain_attach(&dev->dev, true);
378 if (ret == -EPROBE_DEFER) { 378 if (ret) {
379 iounmap(tmp); 379 iounmap(tmp);
380 goto err_release; 380 goto err_release;
381 } 381 }