From patchwork Fri Jan 30 14:47:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 5750981 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0A783BF440 for ; Fri, 30 Jan 2015 14:51:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 34297201CE for ; Fri, 30 Jan 2015 14:51:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 06F9D202A1 for ; Fri, 30 Jan 2015 14:51:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422796AbbA3OtJ (ORCPT ); Fri, 30 Jan 2015 09:49:09 -0500 Received: from mailout3.w1.samsung.com ([210.118.77.13]:56365 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755118AbbA3Osy (ORCPT ); Fri, 30 Jan 2015 09:48:54 -0500 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NIZ00LK0W01L280@mailout3.w1.samsung.com>; Fri, 30 Jan 2015 14:52:49 +0000 (GMT) X-AuditID: cbfec7f4-b7f126d000001e9a-73-54cb993c22f3 Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 6A.39.07834.C399BC45; Fri, 30 Jan 2015 14:46:20 +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 <0NIZ00EV0VSES470@eusync2.samsung.com>; Fri, 30 Jan 2015 14:48:45 +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 , Russell King Cc: Thomas Gleixner , Pavel Machek , Kyungmin Park , Bartlomiej Zolnierkiewicz , Krzysztof Kozlowski Subject: [PATCH v3 17/20] power_supply: 88pm860x_charger: Decrement the power supply's device reference counter Date: Fri, 30 Jan 2015 15:47:55 +0100 Message-id: <1422629278-12202-18-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1422629278-12202-1-git-send-email-k.kozlowski@samsung.com> References: <1422629278-12202-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAAyWRa0hTcRTA++8+drdcXHx1kVIbiWL4LOhkFn3rFgQW1QeDculQyVebSkqg aRY+UlPLB5razKmlmxvE1Km50rTpfJUlvkgNZKmpMxWZranffufH73A+HAqz7cKdqMiYeLEk RhQlJPm4/t/nr16BpfrrvvKuI5A7sMKB5hIFATW92Tik7RhxKJj/g4G2f5sLslFHyKr2hef1 hRikyxQkDDWdhpfNh6F2tZKEtnIZDr8X/GAgbZELM3+7EbT8XCKhyCzngLwjD4FqboyA8bUN AkZby0kwPfuEIHO9jISJUQFkDlYjkG834TDyocq6sGQhYepLNwlvtQsY9OtHCChbtAN9NgH6 tnhozxjGQK16gcGWco644M4+Ts8h2bo1H3a64yPO5jWZCLalbIrLrqzeZn/lF3JZdZ0nO2+U E6yqIZNkJ8e0JLtsMHDZV31X2c6Kd9agJoXtzpnEg5yC+YFh4qjIRLHE53wIP6JVZ+bEKWwe 5G0Y8FTUyM9CPIqhTzFjUyPkPjsyQ9MKK/MpW/oNYsprt/H9IZfDPOo3EbsVSZ9k1PKavcqe XuIxPbnavQqjJxDToq3n7FZ29H3mSbGCm4UoCqfdmOppr10toFlGq9wk9s85M309hXvMs3rl wuwe29IXmbxvJWQ+ElShAw3IQZwQGie9Gx7t5y0VRUsTYsK9Q2OjVWj/7esaJOsJ0CGaQkIb wQ+R/rotIUqUJkXrEENhQntBUYFVCcJEScliSewdSUKUWKpDHIrnlIrOPdScSQzZPj6/ZV6u WevUNMyvHky+7B83087dvOaufp1yqfhYu2Y4rctg8ZI8rdcPOhhOBAwWJ5/9fsU4VGRUN87e 8Ki0eT8c1HTI2RJana5a9U40xURZysab3fwr1pUZwh2q1+NWlsdyMFeT4KKLdTUv3uT4k/dc Sl2nj+oDhbg0QuTniUmkov/P/DVB1AIAAA== 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);