diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-26 13:14:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-26 13:14:23 -0400 |
| commit | 45352bbf48e95078b4acd20774f49e72676e1e0f (patch) | |
| tree | 7c7121dae3f4ecebb1c08cea5f3b3d1c6c531756 /drivers/power/bq27x00_battery.c | |
| parent | da62aa69c181e3bd465a5c868ece166921a81e14 (diff) | |
| parent | 57894517139b283a3cf27e36b29b4b4d7c45b303 (diff) | |
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6:
power_supply: Makefile cleanup
bq27x00_battery: Add missing kfree(di->bus) in bq27x00_battery_remove()
power_supply: Introduce maximum current property
power_supply: Add types for USB chargers
ds2782_battery: Fix units
power_supply: Add driver for TWL4030/TPS65950 BCI charger
bq20z75: Add support for more power supply properties
wm831x_power: Add missing kfree(wm831x_power) in wm831x_power_remove()
jz4740-battery: Add missing kfree(jz_battery) in jz_battery_remove()
ds2760_battery: Add missing kfree(di) in ds2760_battery_remove()
olpc_battery: Fix endian neutral breakage for s16 values
ds2760_battery: Fix W1 and W1_SLAVE_DS2760 dependency
pcf50633-charger: Add missing sysfs_remove_group()
power_supply: Add driver for TI BQ20Z75 gas gauge IC
wm831x_power: Remove duplicate chg mask
omap: rx51: Add support for USB chargers
power_supply: Add isp1704 charger detection driver
Diffstat (limited to 'drivers/power/bq27x00_battery.c')
| -rw-r--r-- | drivers/power/bq27x00_battery.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c index 3ec9c6a8896b..eff0273d4030 100644 --- a/drivers/power/bq27x00_battery.c +++ b/drivers/power/bq27x00_battery.c | |||
| @@ -418,6 +418,7 @@ static int bq27x00_battery_remove(struct i2c_client *client) | |||
| 418 | 418 | ||
| 419 | power_supply_unregister(&di->bat); | 419 | power_supply_unregister(&di->bat); |
| 420 | 420 | ||
| 421 | kfree(di->bus); | ||
| 421 | kfree(di->bat.name); | 422 | kfree(di->bat.name); |
| 422 | 423 | ||
| 423 | mutex_lock(&battery_mutex); | 424 | mutex_lock(&battery_mutex); |