PM / Domains: Fix link checking when add subdomain
authorHuang Ying <ying.huang@intel.com>
Mon, 7 May 2012 19:35:45 +0000 (21:35 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Fri, 11 May 2012 19:11:37 +0000 (21:11 +0200)
Current pm_genpd_add_subdomain() will allow duplicated link between
master and slave domain.  This patch fixed it.

Because when current pm_genpd_add_subdomain() checks whether the link
between the master and slave generic PM domain already exists,
slave_links instead of master_links of master domain is used.

Signed-off-by: Huang Ying <ying.huang@intel.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
drivers/base/power/domain.c

index cde5983de6c233dc09921d052c9a9ca135f08ed8..c3eaa08a8f963a724386e0d5d8e09bb7e353eb37 100644 (file)
@@ -1448,7 +1448,7 @@ int pm_genpd_add_subdomain(struct generic_pm_domain *genpd,
                goto out;
        }
 
-       list_for_each_entry(link, &genpd->slave_links, slave_node) {
+       list_for_each_entry(link, &genpd->master_links, master_node) {
                if (link->slave == subdomain && link->master == genpd) {
                        ret = -EINVAL;
                        goto out;