4.2.8-ckt12 -stable review patch.  If anyone has any objections, please let me 
know.

---8<------------------------------------------------------------

From: Dan Carpenter <[email protected]>

commit b9223da41794030a5dfd5106c34ed1b98255e2ae upstream.

We accidentally free "micro_ac_power" which is an error pointer and it
leads to an oops.  We intended to free "micro_batt_power".

Fixes: a2c1d531854c ('power_supply: ipaq_micro_battery: Check return values in 
probe')
Signed-off-by: Dan Carpenter <[email protected]>
Signed-off-by: Sebastian Reichel <[email protected]>
Signed-off-by: Kamal Mostafa <[email protected]>
---
 drivers/power/ipaq_micro_battery.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/power/ipaq_micro_battery.c 
b/drivers/power/ipaq_micro_battery.c
index f03014e..65e9921 100644
--- a/drivers/power/ipaq_micro_battery.c
+++ b/drivers/power/ipaq_micro_battery.c
@@ -261,7 +261,7 @@ static int micro_batt_probe(struct platform_device *pdev)
        return 0;
 
 ac_err:
-       power_supply_unregister(micro_ac_power);
+       power_supply_unregister(micro_batt_power);
 batt_err:
        cancel_delayed_work_sync(&mb->update);
        destroy_workqueue(mb->wq);
-- 
2.7.4

Reply via email to