From 2c15a1d30d650517bb032907dd072225c427ff76 Mon Sep 17 00:00:00 2001
From: Huang Ying <ying.huang@intel.com>
Date: Mon, 7 May 2012 21:35:45 +0200
Subject: [PATCH] --- yaml --- r: 305827 b: refs/heads/master c:
 4fcac10d28e7a046120b51a106b19082d2e57401 h: refs/heads/master i:   305825:
 2a932b6360d4b0f6105f554e655280ccf9bcb245   305823:
 c686062352e72811ba9b5e1f50d3399e86497499 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/base/power/domain.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 59ffa0f6207f..e2778c401f52 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ff7bb0d02f82968be13937c03e93b6c090229df
+refs/heads/master: 4fcac10d28e7a046120b51a106b19082d2e57401
diff --git a/trunk/drivers/base/power/domain.c b/trunk/drivers/base/power/domain.c
index cde5983de6c2..c3eaa08a8f96 100644
--- a/trunk/drivers/base/power/domain.c
+++ b/trunk/drivers/base/power/domain.c
@@ -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;