aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-12-01 08:58:34 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-12-04 09:12:07 -0500
commit31eb7431805493e10f4731f366cf4d4e3e952035 (patch)
tree1c8660f0d9f4dd014b5b4808418586afb06bf2ac
parentae64f9bd1d3621b5e60d7363bc20afb46aede215 (diff)
PM / runtime: Fix handling of suppliers with disabled runtime PM
Prevent rpm_get_suppliers() from returning an error code if runtime PM is disabled for one or more of the supplier devices it wants to runtime-resume, so as to make runtime PM work for devices with links to suppliers that don't use runtime PM (such links may be created during device enumeration even before it is known whether or not runtime PM will be enabled for the devices in question, for example). Fixes: 21d5c57b3726 (PM / runtime: Use device links) Reported-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-by: Lukas Wunner <lukas@wunner.de> Tested-by: Adrian Hunter <adrian.hunter@intel.com>
-rw-r--r--drivers/base/power/runtime.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 027d159ac381..6e89b51ea3d9 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -276,7 +276,8 @@ static int rpm_get_suppliers(struct device *dev)
276 continue; 276 continue;
277 277
278 retval = pm_runtime_get_sync(link->supplier); 278 retval = pm_runtime_get_sync(link->supplier);
279 if (retval < 0) { 279 /* Ignore suppliers with disabled runtime PM. */
280 if (retval < 0 && retval != -EACCES) {
280 pm_runtime_put_noidle(link->supplier); 281 pm_runtime_put_noidle(link->supplier);
281 return retval; 282 return retval;
282 } 283 }