If the charger was removed, we fell through back to old
hdq-driven code with normally wrong but slightly random
results for charging LED behaviour in that circumstance
This patch makes us use the tracked charger status
callbacks alone if they are defined in the platform
data.
Signed-off-by: Andy Green <[EMAIL PROTECTED]>
---
drivers/power/bq27000_battery.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/power/bq27000_battery.c b/drivers/power/bq27000_battery.c
index 7020608..4c7e862 100644
--- a/drivers/power/bq27000_battery.c
+++ b/drivers/power/bq27000_battery.c
@@ -182,12 +182,16 @@ static int bq27000_battery_get_property(struct
power_supply *psy,
*/
if (!di->pdata->get_charger_active_status)
goto use_bat;
- if ((di->pdata->get_charger_active_status)())
+
+ if ((di->pdata->get_charger_active_status)()) {
val->intval = POWER_SUPPLY_STATUS_CHARGING;
- else
- val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
- break;
+ break;
+ }
}
+
+ val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
+ break;
+
use_bat:
/*
* either the charger is not connected, or the
