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: 13980 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 9491923E27 for ; Fri, 11 Jan 2013 13:13:36 +0000 (UTC) Received: from mail-vb0-f42.google.com (mail-vb0-f42.google.com [209.85.212.42]) by fiordland.canonical.com (Postfix) with ESMTP id 49F0DA18C70 for ; Fri, 11 Jan 2013 13:13:36 +0000 (UTC) Received: by mail-vb0-f42.google.com with SMTP id fa15so1414564vbb.1 for ; Fri, 11 Jan 2013 05:13:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=9J9JnPk7PWS+OujKcXxrPgBM1Re38rFqazVvOjhH21s=; b=kiOyeFDYx40WarfEzik4D3QQEPt9Ao295OP6ZO2h7WLyf/hMrtvGkeA3Lj8cmEUwDg SJsoF2oG/xH1DgPPiV+eSts3g4vsUPXuBRMoms/q5zRAK9XAvie612AjVUaSpBanjwVe Exh9UVb2D6SS23zGwE6n+gxTrR14AfiROjM1eZKqwKXW+KzksT3aaRgTveZnk295a2Co /1vET4/AKp+98OCqO9Ipv93os7CVQAUtDIf8zoVwZu0dZfQ2/80P+kYKRF01my+iVtai LxzN1WFwAkbBc01eiITiS+iGxuK1yBN9niXvQvNK/NHWHl6DiK5Z18kFQyWEnOfYi0oz 1w8A== X-Received: by 10.52.70.205 with SMTP id o13mr81893243vdu.75.1357910015738; Fri, 11 Jan 2013 05:13:35 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.145.101 with SMTP id st5csp111235veb; Fri, 11 Jan 2013 05:13:35 -0800 (PST) X-Received: by 10.180.109.201 with SMTP id hu9mr15055990wib.32.1357910014661; Fri, 11 Jan 2013 05:13:34 -0800 (PST) Received: from mail-wg0-f52.google.com (mail-wg0-f52.google.com [74.125.82.52]) by mx.google.com with ESMTPS id gd7si8677229wjb.35.2013.01.11.05.13.34 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Jan 2013 05:13:34 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.52 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.52; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.52 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-wg0-f52.google.com with SMTP id 12so791545wgh.31 for ; Fri, 11 Jan 2013 05:13:34 -0800 (PST) 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 Cc: arnd@arndb.de, linus.walleij@stericsson.com, cbouatmailru@gmail.com, Rickard Andersson , Lee Jones 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: ALoCoQn6aF7pJSeX3z9bIRVac/E1IRCzY3bqcccnvfK/nSLyK0k7rzm84QdSHscJ3XMQApXC3+sQ 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; }