diff options
author | Andres Salomon <dilinger@queued.net> | 2007-12-12 14:12:59 -0500 |
---|---|---|
committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2008-02-01 18:42:59 -0500 |
commit | 839dc9f105c0d856f9a0be48fb3bd0982ff5df5b (patch) | |
tree | a16cad00b33e82d3a11b186806eb9590b69ddaca /drivers | |
parent | 8efe444038a205e79b38b7ad03878824901849a8 (diff) |
power: fix incorrect unregistration in power_supply_create_attrs error path
In power_supply_create_attrs(), we create static attributes as referenced
by power_supply_static_attrs[i]. After that, if we fail, we unregister
via power_supply_static_attrs[psy->properties[i]]. This is incorrect, as
psy->properties has absolutely no bearing on static attribs. This patch
fixes it to unregister the correct attrib.
Another line which was unnecessarily line wrapped is also unwrapped.
Signed-off-by: Andres Salomon <dilinger@debian.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/power/power_supply_sysfs.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c index 7a2163fa61c3..bab591ba785a 100644 --- a/drivers/power/power_supply_sysfs.c +++ b/drivers/power/power_supply_sysfs.c | |||
@@ -155,8 +155,7 @@ dynamics_failed: | |||
155 | &power_supply_attrs[psy->properties[j]]); | 155 | &power_supply_attrs[psy->properties[j]]); |
156 | statics_failed: | 156 | statics_failed: |
157 | while (i--) | 157 | while (i--) |
158 | device_remove_file(psy->dev, | 158 | device_remove_file(psy->dev, &power_supply_static_attrs[i]); |
159 | &power_supply_static_attrs[psy->properties[i]]); | ||
160 | succeed: | 159 | succeed: |
161 | return rc; | 160 | return rc; |
162 | } | 161 | } |
@@ -166,8 +165,7 @@ void power_supply_remove_attrs(struct power_supply *psy) | |||
166 | int i; | 165 | int i; |
167 | 166 | ||
168 | for (i = 0; i < ARRAY_SIZE(power_supply_static_attrs); i++) | 167 | for (i = 0; i < ARRAY_SIZE(power_supply_static_attrs); i++) |
169 | device_remove_file(psy->dev, | 168 | device_remove_file(psy->dev, &power_supply_static_attrs[i]); |
170 | &power_supply_static_attrs[i]); | ||
171 | 169 | ||
172 | for (i = 0; i < psy->num_properties; i++) | 170 | for (i = 0; i < psy->num_properties; i++) |
173 | device_remove_file(psy->dev, | 171 | device_remove_file(psy->dev, |