From b38e3405ea516678064c21da91f15be3c1642ef0 Mon Sep 17 00:00:00 2001 From: Vic Yang Date: Thu, 28 Jun 2012 15:45:24 +0800 Subject: [PATCH] Do not trickle charge when battery ask for no current When battery ask for no current, we should go back to init state to determine what to do next. BUG=chrome-os-partner:10946 TEST=none Change-Id: Idf3ac7554a0774655138c5efe9c5e6de7f6cb7a0 Reviewed-on: https://gerrit.chromium.org/gerrit/26310 Reviewed-by: Rong Chang Tested-by: Vic Yang Commit-Ready: Vic Yang --- common/charge_state.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/charge_state.c b/common/charge_state.c index cfc1620db4..39648695cd 100644 --- a/common/charge_state.c +++ b/common/charge_state.c @@ -335,7 +335,8 @@ static enum power_state state_charge(struct power_state_context *ctx) if (ctx->curr.error) return PWR_STATE_ERROR; - if (ctx->curr.batt.desired_current < ctx->charger->current_min) + if (ctx->curr.batt.desired_current < ctx->charger->current_min && + ctx->curr.batt.desired_current > 0) return trickle_charge(ctx); /* Check charger reset */