If the charger is pulled out, just return as DISCHARGING.
 Then no need for additional 'else' statement.

Signed-off-by: Milo(Woogyom) Kim <milo....@ti.com>
---
 drivers/power/lp8727_charger.c |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/power/lp8727_charger.c b/drivers/power/lp8727_charger.c
index ce59282..ee1dfaa 100644
--- a/drivers/power/lp8727_charger.c
+++ b/drivers/power/lp8727_charger.c
@@ -336,15 +336,16 @@ static int lp8727_battery_get_property(struct 
power_supply *psy,
 
        switch (psp) {
        case POWER_SUPPLY_PROP_STATUS:
-               if (lp8727_is_charger_attached(psy->name, pchg->devid)) {
-                       lp8727_read_byte(pchg, LP8727_STATUS1, &read);
+               if (!lp8727_is_charger_attached(psy->name, pchg->devid)) {
+                       val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
+                       return 0;
+               }
+
+               lp8727_read_byte(pchg, LP8727_STATUS1, &read);
 
-                       val->intval = (read & LP8727_CHGSTAT) == 
LP8727_STAT_EOC ?
+               val->intval = (read & LP8727_CHGSTAT) == LP8727_STAT_EOC ?
                                POWER_SUPPLY_STATUS_FULL :
                                POWER_SUPPLY_STATUS_CHARGING;
-               } else {
-                       val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
-               }
                break;
        case POWER_SUPPLY_PROP_HEALTH:
                lp8727_read_byte(pchg, LP8727_STATUS2, &read);
-- 
1.7.9.5


Best Regards,
Milo


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to