diff options
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-aries.c | 4 | ||||
| -rwxr-xr-x | drivers/power/s5pc110_battery.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pv210/mach-aries.c b/arch/arm/mach-s5pv210/mach-aries.c index 9bf4eee..c2ae21e 100644 --- a/arch/arm/mach-s5pv210/mach-aries.c +++ b/arch/arm/mach-s5pv210/mach-aries.c @@ -2520,6 +2520,10 @@ static void fsa9480_cardock_cb(bool attached) switch_set_state(&switch_dock, 2); else switch_set_state(&switch_dock, 0); + + set_cable_status = attached ? CABLE_TYPE_AC : CABLE_TYPE_NONE; + if (charger_callbacks && charger_callbacks->set_cable) + charger_callbacks->set_cable(charger_callbacks, set_cable_status); } static void fsa9480_reset_cb(void) diff --git a/drivers/power/s5pc110_battery.c b/drivers/power/s5pc110_battery.c index cd8779b..3567e1b 100755 --- a/drivers/power/s5pc110_battery.c +++ b/drivers/power/s5pc110_battery.c @@ -301,7 +301,8 @@ static int s3c_ac_get_property(struct power_supply *ps, return -EINVAL; /* Set enable=1 only if the AC charger is connected */ - val->intval = (chg->cable_status == CABLE_TYPE_AC); + val->intval = ((chg->cable_status == CABLE_TYPE_AC) && + max8998_check_vdcin(chg)); return 0; } |