linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] sbs-battery: fix power status when battery is dry
@ 2016-03-23  9:53 YH Huang
  2016-03-24  4:01 ` Daniel Kurtz
  0 siblings, 1 reply; 15+ messages in thread
From: YH Huang @ 2016-03-23  9:53 UTC (permalink / raw)
  To: linux-arm-kernel

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

^ permalink raw reply related	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2016-04-06  2:35 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-23  9:53 [PATCH] sbs-battery: fix power status when battery is dry YH Huang
2016-03-24  4:01 ` 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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).