summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-03-31 16:33:31 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-31 11:26:17 +0100
commit5f12760d289fd2da685cb54eebb08c107b146872 (patch)
tree41b02d2154193135f66681108f91f397fff36b77
parente032b376551a61662b20a2c8544fbbc568ab2e7f (diff)
downloadlinux-stable-5f12760d289fd2da685cb54eebb08c107b146872.tar.gz
linux-stable-5f12760d289fd2da685cb54eebb08c107b146872.tar.bz2
linux-stable-5f12760d289fd2da685cb54eebb08c107b146872.zip
regulator: fix sysfs name collision between dummy and fixed dummy regulator
When regulator_register_fixed() is being used to register fixed dummy regulator, the following line will be seen in the boot log. And the sysfs entry for fixed dummy regulator is not shown. dummy: Failed to create debugfs directory The patch renames the fixed dummy supply to "fixed-dummy" to avoid the name collision with dummy regulator. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--drivers/regulator/fixed-helper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/fixed-helper.c b/drivers/regulator/fixed-helper.c
index 30d0a15b8949..efb52dcefd35 100644
--- a/drivers/regulator/fixed-helper.c
+++ b/drivers/regulator/fixed-helper.c
@@ -32,7 +32,7 @@ struct platform_device *regulator_register_fixed(int id,
if (!data)
return NULL;
- data->cfg.supply_name = "dummy";
+ data->cfg.supply_name = "fixed-dummy";
data->cfg.microvolts = 0;
data->cfg.gpio = -EINVAL;
data->cfg.enabled_at_boot = 1;