From patchwork Mon Jan 21 12:03:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 14160 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 33EDE23EC8 for ; Mon, 21 Jan 2013 12:05:05 +0000 (UTC) Received: from mail-vb0-f43.google.com (mail-vb0-f43.google.com [209.85.212.43]) by fiordland.canonical.com (Postfix) with ESMTP id C3B88A18E77 for ; Mon, 21 Jan 2013 12:05:04 +0000 (UTC) Received: by mail-vb0-f43.google.com with SMTP id fs19so5523916vbb.16 for ; Mon, 21 Jan 2013 04:05:04 -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:mime-version:content-type :content-transfer-encoding:x-gm-message-state; bh=cLVQiH6ChlyN+5j/PHnIiHIJ702EXpiUtVATHkdivY8=; b=gOFzrFA4cMmlSdTGF7tSED8kx1iYrV9PqqU+nkT6l1OiG9baXxzUv6EnXHZWUTdYSY we21nlmYnprYb7BtGVn/VB+M55F1SkapBywRJuMII2sUxivmlb/SsWFqQVJi2NPvCOVQ NZOL2P9arupfZGy2o5VTsr7SYTu3NVjvzSR/Ve5XhoC4C/rBb5y8lXAxCdpmBgvpZQ72 dKsgftbBumhRG7GYjYK4ngSYkbHd90Rg0KGGdKKvEUMcQj5grcrGMNIeGqdjzEFVmrea ag+mL1tAzJxyZnfvditkqLCRZkeF+kUpZZHLteJRLtJq3YKveBgeXkprVCRND76ZgN0B hifw== X-Received: by 10.52.70.205 with SMTP id o13mr16698581vdu.75.1358769904332; Mon, 21 Jan 2013 04:05:04 -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 st5csp197738veb; Mon, 21 Jan 2013 04:05:03 -0800 (PST) X-Received: by 10.180.85.103 with SMTP id g7mr15061048wiz.29.1358769890410; Mon, 21 Jan 2013 04:04:50 -0800 (PST) Received: from mail-wg0-f51.google.com (mail-wg0-f51.google.com [74.125.82.51]) by mx.google.com with ESMTPS id k17si3807592wie.98.2013.01.21.04.04.50 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 21 Jan 2013 04:04:50 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.51 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.51; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.51 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-f51.google.com with SMTP id 8so1906845wgl.18 for ; Mon, 21 Jan 2013 04:04:50 -0800 (PST) X-Received: by 10.180.101.99 with SMTP id ff3mr15048640wib.21.1358769886561; Mon, 21 Jan 2013 04:04:46 -0800 (PST) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPS id i2sm16575305wiw.3.2013.01.21.04.04.44 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 21 Jan 2013 04:04:45 -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, anton.vorontsov@linaro.org, cbou@mail.ru, =?UTF-8?q?Martin=20Bergstr=C3=B6m?= , Lee Jones Subject: [PATCH 15/24] ab8500-fg: Go to INIT_RECOVERY when charger removed Date: Mon, 21 Jan 2013 12:03:51 +0000 Message-Id: <1358769840-4763-16-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1358769840-4763-1-git-send-email-lee.jones@linaro.org> References: <1358769840-4763-1-git-send-email-lee.jones@linaro.org> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQly3AjK/zLjVem9QIqpSB0+RTh7+afJvbOZft1jIrNrxEYfGwDk44Bv0dn9ae9lKNthtWKz From: Martin Bergström When the charger is removed we need to go to INIT_RECOVERY state instead of directly to RECOVERY state. Signed-off-by: Lee Jones Signed-off-by: Martin Bergstrom Reviewed-by: Marcus COOPER Reviewed-by: Jonas ABERG Tested-by: Jonas ABERG --- drivers/power/ab8500_fg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c index 238eeee..0378aab 100644 --- a/drivers/power/ab8500_fg.c +++ b/drivers/power/ab8500_fg.c @@ -1450,7 +1450,7 @@ static void ab8500_fg_algorithm_discharging(struct ab8500_fg *di) if (di->recovery_needed) { ab8500_fg_discharge_state_to(di, - AB8500_FG_DISCHARGE_RECOVERY); + AB8500_FG_DISCHARGE_INIT_RECOVERY); queue_delayed_work(di->fg_wq, &di->fg_periodic_work, 0);