On Wed, Dec 12, 2007 at 02:12:59PM -0500, Andres Salomon wrote: > > 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.
Will apply to battery-2.6.git, and will try to push this into 2.6.24. Much thanks. > Signed-off-by: Andres Salomon <[EMAIL PROTECTED]> > --- > 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 0331e82..8efedba 100644 > --- a/drivers/power/power_supply_sysfs.c > +++ b/drivers/power/power_supply_sysfs.c > @@ -153,8 +153,7 @@ dynamics_failed: > &power_supply_attrs[psy->properties[j]]); > statics_failed: > while (i--) > - device_remove_file(psy->dev, > - &power_supply_static_attrs[psy->properties[i]]); > + device_remove_file(psy->dev, &power_supply_static_attrs[i]); > succeed: > return rc; > } > @@ -164,8 +163,7 @@ void power_supply_remove_attrs(struct power_supply *psy) > int i; > > for (i = 0; i < ARRAY_SIZE(power_supply_static_attrs); i++) > - device_remove_file(psy->dev, > - &power_supply_static_attrs[i]); > + device_remove_file(psy->dev, &power_supply_static_attrs[i]); > > for (i = 0; i < psy->num_properties; i++) > device_remove_file(psy->dev, > -- > 1.5.3.5 > > -- Anton Vorontsov email: [EMAIL PROTECTED] backup email: [EMAIL PROTECTED] irc://irc.freenode.net/bd2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
