From patchwork Mon Feb 23 11:47:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 5864241 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5D03E9F269 for ; Mon, 23 Feb 2015 11:48:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9E9292061F for ; Mon, 23 Feb 2015 11:48:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BB89420618 for ; Mon, 23 Feb 2015 11:48:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752582AbbBWLse (ORCPT ); Mon, 23 Feb 2015 06:48:34 -0500 Received: from mailout4.w1.samsung.com ([210.118.77.14]:49176 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752219AbbBWLs2 (ORCPT ); Mon, 23 Feb 2015 06:48:28 -0500 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NK800KKZ3NAXMA0@mailout4.w1.samsung.com>; Mon, 23 Feb 2015 11:52:22 +0000 (GMT) X-AuditID: cbfec7f4-b7f126d000001e9a-34-54eb12f50784 Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 29.6A.07834.5F21BE45; Mon, 23 Feb 2015 11:45:57 +0000 (GMT) Received: from AMDC1943.digital.local ([106.116.151.171]) by eusync2.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0NK8001843FJ0A90@eusync2.samsung.com>; Mon, 23 Feb 2015 11:48:22 +0000 (GMT) From: Krzysztof Kozlowski To: Sebastian Reichel , Dmitry Eremin-Solenikov , David Woodhouse , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, "Rafael J. Wysocki" , Len Brown , Jiri Kosina , David Herrmann , Cezary Jackiewicz , Darren Hart , Support Opensource , Milo Kim , Julian Andres Klode , Marc Dietrich , Greg Kroah-Hartman , linux-acpi@vger.kernel.org, linux-input@vger.kernel.org, platform-driver-x86@vger.kernel.org, patches@opensource.wolfsonmicro.com, ac100@lists.launchpad.net, linux-tegra@vger.kernel.org, devel@driverdev.osuosl.org, Linus Walleij , Samuel Ortiz , Lee Jones , linux-arm-kernel@lists.infradead.org, Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Daniel Mack , Haojian Zhuang , Robert Jarzmik Cc: Thomas Gleixner , Pavel Machek , Kyungmin Park , Marek Szyprowski , Krzysztof Kozlowski Subject: [PATCH v4 17/20] power_supply: 88pm860x_charger: Decrement the power supply's device reference counter Date: Mon, 23 Feb 2015 12:47:38 +0100 Message-id: <1424692061-30624-18-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1424692061-30624-1-git-send-email-k.kozlowski@samsung.com> References: <1424692061-30624-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAAy2RWUxTYRCF/e/W24bGa1m8QDBao4moLFFkBCEmPvj7YMCIxpAoVmzAyGYL KC6BgD4Alq0ISgAlRaoge6KyCFgBRVbBkCCbBNCy70QR0BZ8m3PmO3MehiUl7ygr9lpQqFwR JAuQMiKqef3j14NLkgkvh6o6O0honSUg91M8BdFr4xSkjMyQUN2yIgBNlwXE5ThA8ks1CTGa YgY6ipwhrXQ75M09ZaAqU0PBhN4RWqMnBTC41ICgYmiKgdRVLQHamkQEZcPdNPTML9PQVZnJ wIKqHkHsYgYDhfX9Aohtz0GgXSmioLPumSEx9ZeB/s8NDBRU60loae6kIWPSFJrjaWiuCoV3 D76QUF72iIRfJcP08b34xbw9Hqj5QOHEogUaV2T0C/Ds3CU8mqQW4PIXtnhkXEvjsvxYBvd1 VzN4uq1NgLObzuDarFcGIDcSNzzso/BY8h/G09JbdOyqPOBauFxh735Z5F+pWyVCik1uJS63 UVGoUBSHhCzPHebVP9bozdmC7xgoZuKQiJVwzxFf0J35XyQQfN5YLGGkGO4QX67N3ViYcY1C /n2hijAKkutE/PBIk8BImXI3+HT1t427FLeH/6k3JoSsmMN8XvIUsdm3g29qVBsYlhUa/MHX 4UZbwp3kVaWpKAmJn6Et+chcHuYborziF+hop5QFKsOC/Ox8gwPL0ObLF98iTaOLDnEskpqI v4ePe0loWbgyIlCHeJaUmomtfxss8VVZxG25IthHERYgV+oQwQqtopCHWcp5qev+U/fchwYJ 7+mjbZlrR5ycd59OX6+8/wTErVsbd0UKc7q86g5YNey7o5/p/Wju55GQEhHl8jgrpGTK3TV1 9M3ZUWHCddeCmzHttebbhvbcNXHrsValYXlJvBNq13me8A9ysnQeqjm30+2CTVWKqc/z7OlR fa/KZkWTcVFKKf1ljrakQin7B2oaSuLQAgAA Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use power_supply_put() to decrement the power supply's device reference counter. Signed-off-by: Krzysztof Kozlowski Acked-by: Pavel Machek Reviewed-by: Bartlomiej Zolnierkiewicz Reviewed-by: Sebastian Reichel --- 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 a7f32a5b2299..bf822aa00c14 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);