diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-07-05 10:19:42 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-05 16:15:40 +0400 |
| commit | e2c98eaf928a2a0ecaca1db9aa5dc56a36699d9f (patch) | |
| tree | 705a66684c47b0f807ab652c7504d93f2db7edc2 /drivers/regulator | |
| parent | e113d792d56d4b720b3d84c122b6af84c3bfa094 (diff) | |
| download | linux-e2c98eaf928a2a0ecaca1db9aa5dc56a36699d9f.tar.xz | |
regulator: core: remove sysfs entry properly in regulator_put
With changes introduced by commit 222cc7b (regulator: core: Allow
multiple requests of a single supply mapping) on create_regulator,
regulator_put needs a corresponding update on sysfs entry removing.
Also regulator->dev still needs to get assigned in create_regulator,
otherwise, sysfs_remove_link call in regulator_put will get bypassed.
Reported-by: Fabio Estevam <festevam@gmail.com>
Tested-by: Dong Aisheng <dong.aisheng@linaro.org>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/core.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index f98a8ee29933..974276afd1f0 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1063,6 +1063,8 @@ static struct regulator *create_regulator(struct regulator_dev *rdev, list_add(®ulator->list, &rdev->consumer_list); if (dev) { + regulator->dev = dev; + /* Add a link to the device sysfs entry */ size = scnprintf(buf, REG_STR_SIZE, "%s-%s", dev->kobj.name, supply_name); @@ -1359,11 +1361,8 @@ void regulator_put(struct regulator *regulator) debugfs_remove_recursive(regulator->debugfs); /* remove any sysfs entries */ - if (regulator->dev) { + if (regulator->dev) sysfs_remove_link(&rdev->dev.kobj, regulator->supply_name); - device_remove_file(regulator->dev, ®ulator->dev_attr); - kfree(regulator->dev_attr.attr.name); - } kfree(regulator->supply_name); list_del(®ulator->list); kfree(regulator); |