From patchwork Thu Sep 27 20:08:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 11785 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 642B224140 for ; Thu, 27 Sep 2012 20:09:37 +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 02AB8A191A6 for ; Thu, 27 Sep 2012 20:09:36 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so5234801iej.11 for ; Thu, 27 Sep 2012 13:09:36 -0700 (PDT) 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 :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=p1t8DKMchWmGyaP0FU6rkoB3AtXogHwoq/tKqVLfk9E=; b=d7W6TkkbDb6MeDXRqzr7kBdKYl9Gmbvs473N4+nKCHYvzqSFkYyruLikQ+YQUO35rh UZXV4Ft9HVYvVJ0/NQJdfzrg7g4vNTHMujfIdWl4NJeZaW3GdlM7KY/tsBf75Ai8xiab qP/vxXbB3BswmDBuvVonsgcQnK5PqqKGiqWqqzMCru9q6LMbrVvk59HhpCQ9tETC8HPf 7BPnK2UZ0dGgXlOlJ6tDWNeVawfx9TFi9Se2bGwGyeiFAQ7iegiOeC+yUMjplKQ5kwRz 5scKIcNfDOo4N24KdunT6wpDyCM5jqs3uuZS2OA489BomwsKBo1DrB1EZ8A6hr2no1NH xb2g== Received: by 10.42.109.194 with SMTP id m2mr3830879icp.48.1348776576696; Thu, 27 Sep 2012 13:09:36 -0700 (PDT) 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.184.232 with SMTP id ex8csp436287igc; Thu, 27 Sep 2012 13:09:36 -0700 (PDT) Received: by 10.66.86.133 with SMTP id p5mr12144966paz.35.1348776576125; Thu, 27 Sep 2012 13:09:36 -0700 (PDT) Received: from mail-pb0-f50.google.com (mail-pb0-f50.google.com [209.85.160.50]) by mx.google.com with ESMTPS id pi9si5467641pbb.12.2012.09.27.13.09.35 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 13:09:36 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of mathieu.poirier@linaro.org) client-ip=209.85.160.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of mathieu.poirier@linaro.org) smtp.mail=mathieu.poirier@linaro.org Received: by mail-pb0-f50.google.com with SMTP id md4so1686045pbc.37 for ; Thu, 27 Sep 2012 13:09:35 -0700 (PDT) Received: by 10.68.221.72 with SMTP id qc8mr14558880pbc.63.1348776575829; Thu, 27 Sep 2012 13:09:35 -0700 (PDT) Received: from localhost.localdomain (S0106002369de4dac.cg.shawcable.net. [70.73.24.112]) by mx.google.com with ESMTPS id sa2sm1587890pbc.4.2012.09.27.13.09.34 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 13:09:35 -0700 (PDT) From: mathieu.poirier@linaro.org To: patches@linaro.org Subject: [PATCH 12/57] power: ab8500_fg: balance IRQ enable Date: Thu, 27 Sep 2012 14:08:29 -0600 Message-Id: <1348776554-10019-13-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1348776554-10019-1-git-send-email-mathieu.poirier@linaro.org> References: <1348776554-10019-1-git-send-email-mathieu.poirier@linaro.org> X-Gm-Message-State: ALoCoQnRkYXtv3YMWl6ZJfuMeLX7Th6WvvEEY+df1OW90Ewvwnh8uB0WtofmikJhA1MBQ7n9oMQN 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: Rickard Andersson Signed-off-by: Mathieu Poirier Reviewed-by: Jonas ABERG --- drivers/power/ab8500_fg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c index 7af616c..492f6bf 100644 --- a/drivers/power/ab8500_fg.c +++ b/drivers/power/ab8500_fg.c @@ -746,6 +746,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; }