From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754732AbbBTNd0 (ORCPT ); Fri, 20 Feb 2015 08:33:26 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:58702 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753700AbbBTNch (ORCPT ); Fri, 20 Feb 2015 08:32:37 -0500 X-AuditID: cbfec7f4-b7f126d000001e9a-dc-54e736e12c13 From: Krzysztof Kozlowski To: Sebastian Reichel , Dmitry Eremin-Solenikov , David Woodhouse , Milo Kim , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Dmitry Artamonow , Marek Belisko , Krzysztof Kozlowski , 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 Message-id: <1424439145-16895-4-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1424439145-16895-1-git-send-email-k.kozlowski@samsung.com> References: <1424439145-16895-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprMLMWRmVeSWpSXmKPExsVy+t/xq7oPzZ6HGHQc0LSY9OQ9s8XElZOZ LV6/MLS4vGsOm8Xn3iOMFtvbjrJY/Fu6hc1i+a91LBand5dYLNj4iNGBy2PnrLvsHmven2L2 OHbtDovH5hVaHptWdbJ59G1Zxehx/MZ2Jo/Pm+QCOKK4bFJSczLLUov07RK4Mj7OecZWsICj 4tWMhWwNjD3sXYycHBICJhJ7rm+HssUkLtxbz9bFyMUhJLCUUWL2/4uMEE4fk0TX1m9sIFVs AsYSm5cvAasSEbjOKHHl5TEmEIdZYBqjxNUnK8CqhAXiJY7ugJjLIqAqsfzbLTCbV8BdYuvZ f1D75CROHpvMCmJzCnhIdG6bC2YLAdUse7qOaQIj7wJGhlWMoqmlyQXFSem5hnrFibnFpXnp esn5uZsYIQH5ZQfj4mNWhxgFOBiVeHh/7HkWIsSaWFZcmXuIUYKDWUmE11PheYgQb0piZVVq UX58UWlOavEhRiYOTqkGxlXpV4TXyy36nen+peCRckw7b9G/hBnLrrRy7L2yhOtlztuUVsU1 DYGHb2lflFF7HSb3aoN56k+p3hJbnr7ypD0Rc8omb93DWCZ0q8HwiJF0CcO2Tyo5+XmOBTx+ l31fF6XVVp8z/Hsq50uMgabtZuNlXCk6c54+/nOGJ3Lf613xhh9eV5+QUWIpzkg01GIuKk4E ABJsV4EmAgAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Fixes: 98a276649358 ("power_supply: Add new lp8788 charger driver") Cc: --- 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