From patchwork Fri Jan 11 13:12:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 1965991 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id A3292DF2A2 for ; Fri, 11 Jan 2013 13:20:05 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TteTD-0002u9-D0; Fri, 11 Jan 2013 13:16:29 +0000 Received: from mail-we0-f173.google.com ([74.125.82.173]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TteQS-0001LQ-6P for linux-arm-kernel@lists.infradead.org; Fri, 11 Jan 2013 13:13:39 +0000 Received: by mail-we0-f173.google.com with SMTP id z2so822985wey.32 for ; Fri, 11 Jan 2013 05:13:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=9J9JnPk7PWS+OujKcXxrPgBM1Re38rFqazVvOjhH21s=; b=jLRVEYXiHoks96/sJTwIGtK0/6mOkEDqgyOHDrPv8t/w1TRlyupR/gVoCPgb6w7Pic xe1ZMQoWzJ30/O1RpJ0fMRUud/G+LYsFpGWJuvb+KlrRC+R2vNGeZpm3qosj0UV3alCL vBlUrvdQfhRuTlStFBy/HJAnX59WJCc8vbxJVKL+HkpHN1VBaPtxm0jKGmyMPBOzproX bRkZFwbsqJORkuC0plWGjjlryJpgOgSDzBXXatki+CVcATwZEEs7AOG09aX7QUGl92ze GmqTJwPzUToXQ+M5ja5o744I9yMCb0i29fX+s9j/WEZ6azbygDS6q/YwhEUnFiR5ija7 tL/w== X-Received: by 10.194.77.13 with SMTP id o13mr120987034wjw.58.1357910014285; Fri, 11 Jan 2013 05:13:34 -0800 (PST) Received: from localhost.localdomain (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id p2sm7204515wic.7.2013.01.11.05.13.32 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Jan 2013 05:13:33 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 07/18] power: ab8500_fg: balance IRQ enable Date: Fri, 11 Jan 2013 13:12:55 +0000 Message-Id: <1357909986-9262-8-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1357909986-9262-1-git-send-email-lee.jones@linaro.org> References: <1357909986-9262-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQlm/mDescR2oTxPqNuQhkTLOh+u7+ot0GcE3xJKbYMr7zOTS5PiEkfz1ChiF9tY6wCl55bi X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130111_081337_412306_5B10BCEE X-CRM114-Status: UNSURE ( 9.82 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.173 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Rickard Andersson , Lee Jones , linus.walleij@stericsson.com, arnd@arndb.de, cbouatmailru@gmail.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Rickard Andersson In case of time out error IRQ needs to be disabled otherwise we will get unbalanced enable/disable pairs. Signed-off-by: Lee Jones Signed-off-by: Rickard Andersson Reviewed-by: Jonas ABERG --- drivers/power/ab8500_fg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c index 328717b..7cfc48a 100644 --- a/drivers/power/ab8500_fg.c +++ b/drivers/power/ab8500_fg.c @@ -745,6 +745,7 @@ int ab8500_fg_inst_curr_blocking(struct ab8500_fg *di) dev_dbg(di->dev, "%s instant current: %d", __func__, res); return res; fail: + disable_irq(di->irq); mutex_unlock(&di->cc_lock); return ret; }