From: Krzysztof Kozlowski <k.kozlowski@samsung.com>
To: Sebastian Reichel <sre@kernel.org>,
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>,
David Woodhouse <dwmw2@infradead.org>, Milo Kim <milo.kim@ti.com>,
linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Dmitry Artamonow <mad_soft@inbox.ru>,
Marek Belisko <marek@goldelico.com>,
Krzysztof Kozlowski <k.kozlowski@samsung.com>,
stable@vger.kernel.org
Subject: [RFT RESEND 4/4] power_supply: lp8788-charger: Fix leaked power supply on probe fail
Date: Fri, 20 Feb 2015 14:32:25 +0100 [thread overview]
Message-ID: <1424439145-16895-4-git-send-email-k.kozlowski@samsung.com> (raw)
In-Reply-To: <1424439145-16895-1-git-send-email-k.kozlowski@samsung.com>
Driver forgot to unregister charger power supply if registering of
battery supply failed in probe(). In such case the memory associated
with power supply leaked.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Fixes: 98a276649358 ("power_supply: Add new lp8788 charger driver")
Cc: <stable@vger.kernel.org>
---
drivers/power/lp8788-charger.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/power/lp8788-charger.c b/drivers/power/lp8788-charger.c
index 21fc233c7d61..176dab2e4c16 100644
--- a/drivers/power/lp8788-charger.c
+++ b/drivers/power/lp8788-charger.c
@@ -417,8 +417,10 @@ static int lp8788_psy_register(struct platform_device *pdev,
pchg->battery.num_properties = ARRAY_SIZE(lp8788_battery_prop);
pchg->battery.get_property = lp8788_battery_get_property;
- if (power_supply_register(&pdev->dev, &pchg->battery))
+ if (power_supply_register(&pdev->dev, &pchg->battery)) {
+ power_supply_unregister(&pchg->charger);
return -EPERM;
+ }
return 0;
}
--
1.9.1
next prev parent reply other threads:[~2015-02-20 13:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-20 13:32 [RFT RESEND 1/4] power_supply: twl4030_madc: Check return value of power_supply_register Krzysztof Kozlowski
2015-02-20 13:32 ` [RFT RESEND 2/4] power_supply: ipaq_micro_battery: Fix leaking workqueue Krzysztof Kozlowski
2015-02-20 13:32 ` [RFT RESEND 3/4] power_supply: ipaq_micro_battery: Check return values in probe Krzysztof Kozlowski
2015-02-20 13:32 ` Krzysztof Kozlowski [this message]
2015-02-25 21:22 ` [RFT RESEND 1/4] power_supply: twl4030_madc: Check return value of power_supply_register Sebastian Reichel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1424439145-16895-4-git-send-email-k.kozlowski@samsung.com \
--to=k.kozlowski@samsung.com \
--cc=dbaryshkov@gmail.com \
--cc=dwmw2@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mad_soft@inbox.ru \
--cc=marek@goldelico.com \
--cc=milo.kim@ti.com \
--cc=sre@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.