diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-04 21:55:13 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-04 21:55:13 +0200 |
| commit | 23c6d2c73f4c7b1074e21fb3be8220fd677b1f7e (patch) | |
| tree | 899c6e000a8ae4e2fbcd213dfb8b821e293124a8 /drivers/base/power | |
| parent | PM / Domains: Fix missing default_power_down_ok comment (diff) | |
| download | linux-23c6d2c73f4c7b1074e21fb3be8220fd677b1f7e.tar.xz linux-23c6d2c73f4c7b1074e21fb3be8220fd677b1f7e.zip | |
Revert "PM / Domains: Handle safely genpd_syscore_switch() call on non-genpd device"
Revert commit 8b55e55ee443 (PM / Domains: Handle safely
genpd_syscore_switch() call on non-genpd device) which was misguided
(the change made by it was not necessary) and it introduced a call to
a function that may sleep into an atomic context code path.
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/base/power')
| -rw-r--r-- | drivers/base/power/domain.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index e342408cfb8d..b463859f185f 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -1148,8 +1148,8 @@ static void genpd_syscore_switch(struct device *dev, bool suspend) { struct generic_pm_domain *genpd; - genpd = genpd_lookup_dev(dev); - if (!genpd) + genpd = dev_to_genpd(dev); + if (!pm_genpd_present(genpd)) return; if (suspend) { |