From: YH Huang <yh.huang@mediatek.com>
To: Sebastian Reichel <sre@kernel.org>,
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>,
David Woodhouse <dwmw2@infradead.org>,
Matthias Brugger <matthias.bgg@gmail.com>
Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org,
YH Huang <yh.huang@mediatek.com>
Subject: [PATCH] sbs-battery: fix power status when battery is dry
Date: Wed, 23 Mar 2016 17:53:14 +0800 [thread overview]
Message-ID: <1458726794-48298-1-git-send-email-yh.huang@mediatek.com> (raw)
When the battery is dry and BATTERY_FULL_DISCHARGED is set,
we should check BATTERY_DISCHARGING to decide the power status.
If BATTERY_DISCHARGING is set, the power status is not charging.
Or the power status should be charging.
Signed-off-by: YH Huang <yh.huang@mediatek.com>
---
drivers/power/sbs-battery.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/drivers/power/sbs-battery.c b/drivers/power/sbs-battery.c
index d6226d6..d86db0e 100644
--- a/drivers/power/sbs-battery.c
+++ b/drivers/power/sbs-battery.c
@@ -382,11 +382,12 @@ static int sbs_get_battery_property(struct i2c_client *client,
if (ret & BATTERY_FULL_CHARGED)
val->intval = POWER_SUPPLY_STATUS_FULL;
- else if (ret & BATTERY_FULL_DISCHARGED)
- val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
- else if (ret & BATTERY_DISCHARGING)
- val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
- else
+ else if (ret & BATTERY_DISCHARGING) {
+ if (ret & BATTERY_FULL_DISCHARGED)
+ val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
+ else
+ val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
+ } else
val->intval = POWER_SUPPLY_STATUS_CHARGING;
if (chip->poll_time == 0)
@@ -702,11 +703,12 @@ static void sbs_delayed_work(struct work_struct *work)
if (ret & BATTERY_FULL_CHARGED)
ret = POWER_SUPPLY_STATUS_FULL;
- else if (ret & BATTERY_FULL_DISCHARGED)
- ret = POWER_SUPPLY_STATUS_NOT_CHARGING;
- else if (ret & BATTERY_DISCHARGING)
- ret = POWER_SUPPLY_STATUS_DISCHARGING;
- else
+ else if (ret & BATTERY_DISCHARGING) {
+ if (ret & BATTERY_FULL_DISCHARGED)
+ ret = POWER_SUPPLY_STATUS_NOT_CHARGING;
+ else
+ ret = POWER_SUPPLY_STATUS_DISCHARGING;
+ } else
ret = POWER_SUPPLY_STATUS_CHARGING;
if (chip->last_state != ret) {
--
1.7.9.5
next reply other threads:[~2016-03-23 9:53 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-23 9:53 YH Huang [this message]
2016-03-24 4:01 ` [PATCH] sbs-battery: fix power status when battery is dry Daniel Kurtz
2016-03-24 6:43 ` YH Huang
2016-03-25 3:06 ` Daniel Kurtz
2016-03-28 2:32 ` YH Huang
2016-03-28 10:05 ` Daniel Kurtz
2016-03-28 15:57 ` Rhyland Klein
2016-03-29 1:52 ` YH Huang
2016-03-29 15:05 ` Rhyland Klein
2016-03-30 8:58 ` YH Huang
2016-03-30 15:09 ` Rhyland Klein
2016-03-30 15:09 ` Sebastian Reichel
2016-03-31 2:42 ` YH Huang
2016-04-02 3:46 ` Sebastian Reichel
2016-04-06 2:35 ` YH Huang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1458726794-48298-1-git-send-email-yh.huang@mediatek.com \
--to=yh.huang@mediatek.com \
--cc=dbaryshkov@gmail.com \
--cc=dwmw2@infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-pm@vger.kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=sre@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox