power: supply: bq27xxx: fix polarity of current_now

current_now has to be negative during discharging and positive during
charging, the behavior seen is the other way round.

Tested on GTA04 with Openmoko battery.

Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

diff --git a/drivers/power/supply/bq27xxx_battery.c b/drivers/power/supply/bq27xxx_battery.c
index 774aa37..4c4a7b1 100644 (file)
--- a/drivers/power/supply/bq27xxx_battery.c
+++ b/drivers/power/supply/bq27xxx_battery.c
@@ -1819,7 +1819,7 @@ static int bq27xxx_battery_current(struct bq27xxx_device_info *di,
 
        if (di->opts & BQ27XXX_O_ZERO) {
                flags = bq27xxx_read(di, BQ27XXX_REG_FLAGS, true);
-               if (flags & BQ27000_FLAG_CHGS) {
+               if (!(flags & BQ27000_FLAG_CHGS)) {
                        dev_dbg(di->dev, "negative current!\n");
                        curr = -curr;
                }
@@ -1827,7 +1827,7 @@ static int bq27xxx_battery_current(struct bq27xxx_device_info *di,
                val->intval = curr * BQ27XXX_CURRENT_CONSTANT / BQ27XXX_RS;
        } else {
                /* Other gauges return signed value */
-               val->intval = (int)((s16)curr) * 1000;
+               val->intval = -(int)((s16)curr) * 1000;
        }
 
        return 0;