From patchwork Thu Dec 13 15:21:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 13544 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 3DCF923E2A for ; Thu, 13 Dec 2012 15:22:10 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id E6650A18A3A for ; Thu, 13 Dec 2012 15:22:09 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id c10so4139320ieb.11 for ; Thu, 13 Dec 2012 07:22:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=PnSGFURYW7niL462UbCBzeQUH4bSmAYvvbVF8bF46Lg=; b=b7pDv93Z+xVpVpc+sSUAMlvY0X8yUIfIvzmISFCS1AztGbSUJVhRPlN6hj8DUwkUYf fEOoeiECdjDy5mfZ4L1pepdKZEkg3gANVOttzBH1bDQ1dmP655lPuZkzpqG6HA2t5oNw siRN7hLjBqgd0968ELrFEICOgxzkbyvFwZrv2XK7xKKcigt7JCKLAeZnkE0g5rfMZReK T0+8CZwUW9XCRVWxW+nXC9HVBcXlUvL3vRhCSLx1KCpwk5YxvInS8FjvJt9ceH2+nOFb itXnvN4DYSdbKLp4oeGtFkHkSj0sS3n1vXFqfDara4R4rEziZykgEDjqsopMxPpRnkwD cd+g== Received: by 10.50.173.34 with SMTP id bh2mr1881119igc.70.1355412129366; Thu, 13 Dec 2012 07:22:09 -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.50.67.148 with SMTP id n20csp16258igt; Thu, 13 Dec 2012 07:22:08 -0800 (PST) Received: by 10.180.74.20 with SMTP id p20mr4049156wiv.0.1355412128173; Thu, 13 Dec 2012 07:22:08 -0800 (PST) Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by mx.google.com with ESMTPS id gg4si12607899wjb.40.2012.12.13.07.22.07 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 13 Dec 2012 07:22:08 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.175 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.175; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.175 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-wi0-f175.google.com with SMTP id hm11so4006280wib.2 for ; Thu, 13 Dec 2012 07:22:07 -0800 (PST) Received: by 10.194.86.40 with SMTP id m8mr9016393wjz.24.1355412127700; Thu, 13 Dec 2012 07:22:07 -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 i6sm8200894wix.5.2012.12.13.07.22.06 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 13 Dec 2012 07:22:07 -0800 (PST) From: Lee Jones To: linux-kernel@vger.kernel.org Cc: cbou@mail.ru, Rickard Andersson , Lee Jones Subject: [PATCH 08/18] power: ab8500_fg: balance IRQ enable Date: Thu, 13 Dec 2012 15:21:31 +0000 Message-Id: <1355412102-14265-9-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1355412102-14265-1-git-send-email-lee.jones@linaro.org> References: <1355412102-14265-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQkCH37ljnzeAbKXsflPvvsEtlKDGPczbX7g1t5FoIB+y0roh10ayXIc1ws78GBA3duU/D0e 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 41eace3..c24dba1 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; }