From: 许盛飞 <xsf@rock-chips.com>
Date: Tue, 24 Sep 2013 09:01:53 +0000 (+0800)
Subject: battery: the bug time-to-full
X-Git-Tag: firefly_0821_release~6611
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f77a65799ca1cb0f2ee222b525846dca2953553a;p=firefly-linux-kernel-4.4.55.git

battery: the bug time-to-full
---

diff --git a/drivers/power/rk30_factory_adc_battery.c b/drivers/power/rk30_factory_adc_battery.c
index 6276cf154746..e15256617583 100644
--- a/drivers/power/rk30_factory_adc_battery.c
+++ b/drivers/power/rk30_factory_adc_battery.c
@@ -695,9 +695,10 @@ static int rk30_adc_battery_status_samples(struct rk30_adc_battery_data *bat)
 					bat->time_to_full = get_seconds();
 				}else if(bat->bat_capacity == 99)
 				{
-					if(get_seconds() - bat->time_to_full > 1800)
+					if(get_seconds() - bat->time_to_full > 1800){
 						bat->bat_capacity = 100;
 						bat->time_to_full = 0;
+					}
 
 				}
 
@@ -709,6 +710,19 @@ static int rk30_adc_battery_status_samples(struct rk30_adc_battery_data *bat)
 
 				bat->full_times = 0;
 				bat->bat_status = POWER_SUPPLY_STATUS_CHARGING;
+
+				if((bat->bat_capacity == 99)&&(bat->time_to_full == 0)){
+				bat->time_to_full = get_seconds();
+				}else if(bat->bat_capacity == 99)
+				{
+					if(get_seconds() - bat->time_to_full > 1800){
+						bat->bat_capacity = 100;
+						bat->time_to_full = 0;
+					}
+
+				}
+
+
 			}else{
 				bat->full_times++;