summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>2015-01-27 16:51:54 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-06 14:40:49 -0800
commit4315974144b8b18eeeb958f43a9d50825a5a4254 (patch)
tree496fd0ca64261fc6255a17b0c5e08ab4badafcce
parent3962a253b21474940c8b858ec0aff0428c2c3e82 (diff)
downloadlwn-4315974144b8b18eeeb958f43a9d50825a5a4254.tar.gz
lwn-4315974144b8b18eeeb958f43a9d50825a5a4254.zip
power_supply: 88pm860x: Fix leaked power supply on probe fail
commit 24727b45b484e8937dcde53fa8d1aa70ac30ec0c upstream. Driver forgot to unregister power supply if request_threaded_irq() failed in probe(). In such case the memory associated with power supply leaked. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Fixes: a830d28b48bf ("power_supply: Enable battery-charger for 88pm860x") Signed-off-by: Sebastian Reichel <sre@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/power/88pm860x_charger.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/power/88pm860x_charger.c b/drivers/power/88pm860x_charger.c
index 36fb4b5a4b0d..1ef35ab79d0f 100644
--- a/drivers/power/88pm860x_charger.c
+++ b/drivers/power/88pm860x_charger.c
@@ -711,6 +711,7 @@ static int pm860x_charger_probe(struct platform_device *pdev)
return 0;
out_irq:
+ power_supply_unregister(&info->usb);
while (--i >= 0)
free_irq(info->irq[i], info);
out: