aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMinsu, Kim <minsu78.kim@samsung.com>2011-02-16 13:39:19 +0900
committerArve Hjønnevåg <arve@android.com>2011-11-17 17:53:17 -0800
commit662d316bc5d2e46c9bfbfd4696bc6728a151864a (patch)
tree09448bb00d0e40544a67c524aa4706cb625f5e73
parent0bdaa735ec4bd426d27e2809225347968ae49fe4 (diff)
downloadkernel_samsung_crespo-662d316bc5d2e46c9bfbfd4696bc6728a151864a.zip
kernel_samsung_crespo-662d316bc5d2e46c9bfbfd4696bc6728a151864a.tar.gz
kernel_samsung_crespo-662d316bc5d2e46c9bfbfd4696bc6728a151864a.tar.bz2
S5PC11X: BATTERY: allow multiple discharge reasons
Change-Id: I6eeab2d3b11ca44b507c2c904d7dd6f16d7157a1 Signed-off-by: Minsu Kim <minsu78.kim@samsung.com>
-rwxr-xr-xdrivers/power/s5pc110_battery.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/power/s5pc110_battery.c b/drivers/power/s5pc110_battery.c
index 198a0e6..6a5be56 100755
--- a/drivers/power/s5pc110_battery.c
+++ b/drivers/power/s5pc110_battery.c
@@ -389,21 +389,21 @@ static void s3c_bat_discharge_reason(struct chg_data *chg)
discharge_reason = chg->bat_info.dis_reason & 0xf;
- if (discharge_reason == DISCONNECT_BAT_FULL &&
+ if (discharge_reason & DISCONNECT_BAT_FULL &&
chg->bat_info.batt_vcell < RECHARGE_COND_VOLTAGE)
chg->bat_info.dis_reason &= ~DISCONNECT_BAT_FULL;
- if (discharge_reason == DISCONNECT_TEMP_OVERHEAT &&
+ if (discharge_reason & DISCONNECT_TEMP_OVERHEAT &&
chg->bat_info.batt_temp <=
HIGH_RECOVER_TEMP)
chg->bat_info.dis_reason &= ~DISCONNECT_TEMP_OVERHEAT;
- if (discharge_reason == DISCONNECT_TEMP_FREEZE &&
+ if (discharge_reason & DISCONNECT_TEMP_FREEZE &&
chg->bat_info.batt_temp >=
LOW_RECOVER_TEMP)
chg->bat_info.dis_reason &= ~DISCONNECT_TEMP_FREEZE;
- if (discharge_reason == DISCONNECT_OVER_TIME &&
+ if (discharge_reason & DISCONNECT_OVER_TIME &&
chg->bat_info.batt_vcell < RECHARGE_COND_VOLTAGE)
chg->bat_info.dis_reason &= ~DISCONNECT_OVER_TIME;