---

yaml --- r: 262146 b: refs/heads/master c: e0eaede h: refs/heads/master v: v3
git-mirror · Jun 9, 2011 · a635c5a · a635c5a
1 parent ae9db28
commit a635c5a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5726ae33c382366ea1b23240d5620dcf675d81d
+refs/heads/master: e0eaedefda8e14ed3f445f382c568c5d69e4223f
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
@@ -1053,8 +1053,9 @@ static struct regulator *create_regulator(struct regulator_dev *rdev,
 
 	if (dev) {
 		/* create a 'requested_microamps_name' sysfs entry */
-		size = scnprintf(buf, REG_STR_SIZE, "microamps_requested_%s",
-			supply_name);
+		size = scnprintf(buf, REG_STR_SIZE,
+				 "microamps_requested_%s-%s",
+				 dev_name(dev), supply_name);
 		if (size >= REG_STR_SIZE)
 			goto overflow_err;