From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751680AbaJPHm1 (ORCPT ); Thu, 16 Oct 2014 03:42:27 -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 S1751518AbaJPHmW (ORCPT ); Thu, 16 Oct 2014 03:42:22 -0400 X-AuditID: cbfec7f5-b7f776d000003e54-8b-543f76dcaa54 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 5/7] power: 88pm860x_charger: Decrement the power supply's device reference counter Date: Thu, 16 Oct 2014 09:42:05 +0200 Message-id: <1413445327-24862-6-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+NgFvrELMWRmVeSWpSXmKPExsVy+t/xa7p3yuxDDB4dUbc4uFXTYuOM9awW S5oyLCY9ec9sMXHlZGaLaRvFLV6/MLRYtvgpo8XZpjfsFve/HmW0mPJnOZPFpsfXWC0u75rD ZvG59wijxcelG1gt1h65y25x6cACJou7p46yWTxe8Zbd4nQ3q8Xp3SUWmzdNZbb4seExq4O4 x4T+T4weO2fdZfdYsKnUY/MKLY/Fe14yeWxa1cnmcefaHjaPd+fOsXvMOxnosXlJvcfHp7dY PN7vu8rm0bdlFaPHitXf2T0+b5LzONHyhTVAIIrLJiU1J7MstUjfLoEr4/qUoILd3BVrJ05k b2A8zNnFyMkhIWAiMfvhTFYIW0ziwr31bCC2kMBSRomfq7i6GLmA7D4miQs7pzKDJNgEjCU2 L1/CBpIQEdjEKrFtxQImEIdZ4DqjxOqrt9lBqoQFMiSWr5gLNpZFQFXi2pXnQEUcHLwC7hKr d2RAbJOTOHlsMlgJp4CHxP/euUwQm90l7r5pZ53AyLuAkWEVo2hqaXJBcVJ6rpFecWJucWle ul5yfu4mRkg8fd3BuPSY1SFGAQ5GJR5ejWD7ECHWxLLiytxDjBIczEoivM2FQCHelMTKqtSi /Pii0pzU4kOMTBycUg2MSYUWHx+v815klCxqnfbF8saX348ulClK8hWYHnA9E5R1pv/F0UxL 8ZLMz5ZBLpZf508I5jatuHzu+A3GdebvlirbORjUlD6faOr0IHVfRVOOe4qnca7PdOH/XEVO NzofMOiWHV7A84XRWMPt+vu/QjJ8E5aflwqbZSS59FV/ZHzt2R8u7yYqsRRnJBpqMRcVJwIA dUKD+YUCAAA= 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. Signed-off-by: Krzysztof Kozlowski Acked-by: Pavel Machek --- drivers/power/88pm860x_charger.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/power/88pm860x_charger.c b/drivers/power/88pm860x_charger.c index 534b3e2e3487..48aa0d829cb0 100644 --- a/drivers/power/88pm860x_charger.c +++ b/drivers/power/88pm860x_charger.c @@ -298,13 +298,18 @@ static int set_charging_fsm(struct pm860x_charger_info *info) return -EINVAL; ret = power_supply_get_property(psy, POWER_SUPPLY_PROP_VOLTAGE_NOW, &data); - if (ret) + if (ret) { + power_supply_put(psy); return ret; + } vbatt = data.intval / 1000; ret = power_supply_get_property(psy, POWER_SUPPLY_PROP_PRESENT, &data); - if (ret) + if (ret) { + power_supply_put(psy); return ret; + } + power_supply_put(psy); mutex_lock(&info->lock); info->present = data.intval; @@ -447,6 +452,7 @@ static irqreturn_t pm860x_temp_handler(int irq, void *data) set_charging_fsm(info); out: + power_supply_put(psy); return IRQ_HANDLED; } @@ -507,6 +513,7 @@ static irqreturn_t pm860x_done_handler(int irq, void *data) out: mutex_unlock(&info->lock); + power_supply_put(psy); dev_dbg(info->dev, "%s, Allowed: %d\n", __func__, info->allowed); set_charging_fsm(info); -- 1.9.1