From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751943AbaJPHns (ORCPT ); Thu, 16 Oct 2014 03:43:48 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:33817 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751538AbaJPHmX (ORCPT ); Thu, 16 Oct 2014 03:42:23 -0400 X-AuditID: cbfec7f5-b7f776d000003e54-8f-543f76dd0c64 From: Krzysztof Kozlowski To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Linus Walleij , Samuel Ortiz , Lee Jones , Sebastian Reichel , Dmitry Eremin-Solenikov , David Woodhouse , Krzysztof Kozlowski , Konrad Rzeszutek Wilk , "Rafael J. Wysocki" , Lv Zheng , Bjorn Helgaas , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org Cc: Anton Vorontsov , Pavel Machek , Kyungmin Park , Marek Szyprowski , Bartlomiej Zolnierkiewicz Subject: [PATCH v2 6/7] power: bq2415x_charger: Decrement the power supply's device reference counter Date: Thu, 16 Oct 2014 09:42:06 +0200 Message-id: <1413445327-24862-7-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1413445327-24862-1-git-send-email-k.kozlowski@samsung.com> References: <1413445327-24862-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrKLMWRmVeSWpSXmKPExsVy+t/xa7p3y+xDDNYtV7Y4uFXTYuOM9awW S5oyLCY9ec9sMXHlZGaLaRvFLV6/MLRYtvgpo8XZpjfsFve/HmW0mPJnOZPFpsfXWC0u75rD ZvG59wijxcelG1gt1h65y25x6cACJou7p46yWTxe8Zbd4nQ3q8Xp3SUWmzdNZbb4seExq4O4 x4T+T4weO2fdZfdYsKnUY/MKLY/Fe14yeWxa1cnmcefaHjaPd+fOsXvMOxnosXlJvcfHp7dY PN7vu8rm0bdlFaPHitXf2T0+b5LzONHyhTVAIIrLJiU1J7MstUjfLoErY97d1+wF7zkqVmy6 xNbAeJa9i5GTQ0LARGLh9wdsELaYxIV764FsLg4hgaWMEnMe3maGcPqYJGa17WYBqWITMJbY vHwJWJWIwCZWiW0rFjCBOMwC1xklVl+9DTZXWCBdovHJR2YQm0VAVeLUgwWMIDavgLvEs4ef oXbLSZw8NpkVxOYU8JD43zuXCcQWAqq5+6addQIj7wJGhlWMoqmlyQXFSem5RnrFibnFpXnp esn5uZsYIVH1dQfj0mNWhxgFOBiVeHg1gu1DhFgTy4orcw8xSnAwK4nwNhcChXhTEiurUovy 44tKc1KLDzEycXBKNTCuMyy8teKB1aYHfyNjP/gzxwiJtpl5LzxYpqHf4nfo+46exWu2bbvU k3+yct6M88s1LzY+EYzWOBH1dMIRNRftuBrHtW8cE3+EKiT4XCx1Vru4ctM/h9kOja2/7zFP DmVLytm92i1kr/ByS4UJ+ccPyUiI/7HLLVe693jZi6eFnu8i9tzv60tRYinOSDTUYi4qTgQA CukBt4gCAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use power_supply_put() to decrement the power supply's device reference counter (increased by power_supply_get_by_name() or power_supply_get_by_phandle()). Signed-off-by: Krzysztof Kozlowski Acked-by: Pavel Machek --- drivers/power/bq2415x_charger.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/power/bq2415x_charger.c b/drivers/power/bq2415x_charger.c index 81a3a78b92d8..8bc9ca9e0275 100644 --- a/drivers/power/bq2415x_charger.c +++ b/drivers/power/bq2415x_charger.c @@ -1684,6 +1684,8 @@ error_4: error_3: bq2415x_power_supply_exit(bq); error_2: + if (!IS_ERR(bq->notify_psy)) + power_supply_put(bq->notify_psy); kfree(name); error_1: mutex_lock(&bq2415x_id_mutex); @@ -1699,8 +1701,10 @@ static int bq2415x_remove(struct i2c_client *client) { struct bq2415x_device *bq = i2c_get_clientdata(client); - if (bq->notify_psy) + if (bq->notify_psy) { power_supply_unreg_notifier(&bq->nb); + power_supply_put(bq->notify_psy); + } bq2415x_sysfs_exit(bq); bq2415x_power_supply_exit(bq); -- 1.9.1