From patchwork Thu Sep 27 20:09:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 11822 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 3EE4E24140 for ; Thu, 27 Sep 2012 20:10:28 +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 E6A82A18351 for ; Thu, 27 Sep 2012 20:10:27 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so5234855iej.11 for ; Thu, 27 Sep 2012 13:10:27 -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=4jtz90gQolrXf5Eavxs+kiTYo5Xh83gedIhS8W+HUMM=; b=Fe80r7yr/x4G6C1bScbpMs7RGo/3CPdZyRmfmBbcFpfLp71kwohqu4hsZc+Bk3xYJn 1mo8jXUo1wRhV9Sy1L5RKMu7npMCnUqqqNMBUi64ZgH33s+bonxRLXytBexwSnuILuDS 8yI2P0nOdl0O2iGbp65eZnabHvHCmDqQeQ5tsvhSJ/WyMpk4+Lt/jHo8AKEQBYBhA1Sj pdV/j8P49jrC9EwoCj+ZPxVNWmPq0cdaolLGQAcBH+Esp/jXTOWOV1BjzxWkdQDj6cyY WwTuYhUoZkARiORSQhDFV7sTqr0BrEUNZ4jbQ1VtCX9nAAAOcu869j+F4VwCjTQrRWni npwA== Received: by 10.50.154.227 with SMTP id vr3mr15237685igb.43.1348776627727; Thu, 27 Sep 2012 13:10:27 -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 ex8csp436396igc; Thu, 27 Sep 2012 13:10:27 -0700 (PDT) Received: by 10.68.242.97 with SMTP id wp1mr14462884pbc.159.1348776627149; Thu, 27 Sep 2012 13:10:27 -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.10.27 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 13:10:27 -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:10:27 -0700 (PDT) Received: by 10.66.75.168 with SMTP id d8mr12166858paw.63.1348776626886; Thu, 27 Sep 2012 13:10:26 -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.10.25 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 13:10:26 -0700 (PDT) From: mathieu.poirier@linaro.org To: patches@linaro.org Subject: [PATCH 49/57] power: Cancelling status charging notification. Date: Thu, 27 Sep 2012 14:09:06 -0600 Message-Id: <1348776554-10019-50-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: ALoCoQm1+CCXHSvSJH4fz9FrL5MqPpEqjypEQaftcpo9c97CLL+F6IXlpqkS1vTSNdgdAvVUgH9Z From: "Mathieu J. Poirier" Signed-off-by: Mathieu Poirier --- drivers/power/abx500_chargalg.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/drivers/power/abx500_chargalg.c b/drivers/power/abx500_chargalg.c index ce58f20..4db0ef0 100644 --- a/drivers/power/abx500_chargalg.c +++ b/drivers/power/abx500_chargalg.c @@ -641,10 +641,8 @@ static void abx500_chargalg_hold_charging(struct abx500_chargalg *di) abx500_chargalg_usb_en(di, false, 0, 0); abx500_chargalg_stop_safety_timer(di); abx500_chargalg_stop_maintenance_timer(di); - di->charge_status = POWER_SUPPLY_STATUS_CHARGING; di->maintenance_chg = false; cancel_delayed_work(&di->chargalg_wd_work); - power_supply_changed(&di->chargalg_psy); } /**