diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2016-10-26 13:13:25 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-10-26 13:13:24 -0700 |
commit | bcd8ec9210c9048c14d934e16267ba79a894db09 (patch) | |
tree | 7e3f49424f21431eab08f679ea6213d6dfa32d1c /drivers/base | |
parent | b12304a53614f77f37dd87b470ae76084e768966 (diff) | |
parent | 617229a3e9400c58b578077ff6f81d2f25a1f5ff (diff) |
Merge "Merge remote-tracking branch 'msm-4.4/tmp-510d0a3f' into msm-4.4"
Diffstat (limited to 'drivers/base')
-rw-r--r-- | drivers/base/power/domain.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 65f50eccd49b..a48824deabc5 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -1381,7 +1381,7 @@ int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd, mutex_lock(&genpd->lock); - if (!list_empty(&subdomain->slave_links) || subdomain->device_count) { + if (!list_empty(&subdomain->master_links) || subdomain->device_count) { pr_warn("%s: unable to remove subdomain %s\n", genpd->name, subdomain->name); ret = -EBUSY; |