diff options
Diffstat (limited to 'drivers/power/wm831x_power.c')
-rw-r--r-- | drivers/power/wm831x_power.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/wm831x_power.c b/drivers/power/wm831x_power.c index fbcc36dae470..ddf8cf5f3204 100644 --- a/drivers/power/wm831x_power.c +++ b/drivers/power/wm831x_power.c | |||
@@ -267,7 +267,6 @@ static void wm831x_config_battery(struct wm831x *wm831x) | |||
267 | ret = wm831x_set_bits(wm831x, WM831X_CHARGER_CONTROL_1, | 267 | ret = wm831x_set_bits(wm831x, WM831X_CHARGER_CONTROL_1, |
268 | WM831X_CHG_ENA_MASK | | 268 | WM831X_CHG_ENA_MASK | |
269 | WM831X_CHG_FAST_MASK | | 269 | WM831X_CHG_FAST_MASK | |
270 | WM831X_CHG_ITERM_MASK | | ||
271 | WM831X_CHG_ITERM_MASK, | 270 | WM831X_CHG_ITERM_MASK, |
272 | reg1); | 271 | reg1); |
273 | if (ret != 0) | 272 | if (ret != 0) |
@@ -612,6 +611,7 @@ static __devexit int wm831x_power_remove(struct platform_device *pdev) | |||
612 | power_supply_unregister(&wm831x_power->battery); | 611 | power_supply_unregister(&wm831x_power->battery); |
613 | power_supply_unregister(&wm831x_power->wall); | 612 | power_supply_unregister(&wm831x_power->wall); |
614 | power_supply_unregister(&wm831x_power->usb); | 613 | power_supply_unregister(&wm831x_power->usb); |
614 | kfree(wm831x_power); | ||
615 | return 0; | 615 | return 0; |
616 | } | 616 | } |
617 | 617 | ||