summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-12-01 14:58:34 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-02-25 11:07:58 +0100
commit0b028b06afc9b2acbae933fa1fd3be120252a4d3 (patch)
tree6e5c85770e22613af25e981deec9fb68a037419b /drivers/base
parent8b9d371a8c01c9ee321f87559f66f207e85a18c5 (diff)
downloadlinux-rpi3-0b028b06afc9b2acbae933fa1fd3be120252a4d3.tar.gz
linux-rpi3-0b028b06afc9b2acbae933fa1fd3be120252a4d3.tar.bz2
linux-rpi3-0b028b06afc9b2acbae933fa1fd3be120252a4d3.zip
PM / runtime: Fix handling of suppliers with disabled runtime PM
[ Upstream commit 31eb7431805493e10f4731f366cf4d4e3e952035 ] 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> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base')
-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 7bcf80fa9ada..b2b1eece0db1 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)
continue;
retval = pm_runtime_get_sync(link->supplier);
- if (retval < 0) {
+ /* Ignore suppliers with disabled runtime PM. */
+ if (retval < 0 && retval != -EACCES) {
pm_runtime_put_noidle(link->supplier);
return retval;
}