From b6a8beef98caadaf3a37e54e005b279228f0dd17 Mon Sep 17 00:00:00 2001 From: Grazvydas Ignotas Date: Sat, 27 Feb 2010 17:06:44 +0200 Subject: [PATCH] --- yaml --- r: 185689 b: refs/heads/master c: afbc74fdc5b96552c384e57119b3cc13c840bf06 h: refs/heads/master i: 185687: 81c62348371201dbd93e64d9c030d821e6f2be1d v: v3 --- [refs] | 2 +- trunk/drivers/power/bq27x00_battery.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a08d2fbd50fe..31a4b5f41f4a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e924a814ac78e325653840190e9e4762e6f4b7c +refs/heads/master: afbc74fdc5b96552c384e57119b3cc13c840bf06 diff --git a/trunk/drivers/power/bq27x00_battery.c b/trunk/drivers/power/bq27x00_battery.c index 5d940fad8d43..bece33ed873c 100644 --- a/trunk/drivers/power/bq27x00_battery.c +++ b/trunk/drivers/power/bq27x00_battery.c @@ -125,7 +125,7 @@ static int bq27x00_battery_voltage(struct bq27x00_device_info *di) return ret; } - return volt; + return volt * 1000; } /* @@ -156,11 +156,11 @@ static int bq27x00_battery_current(struct bq27x00_device_info *di) } if (flags & BQ27000_FLAG_CHGS) { dev_dbg(di->dev, "negative current!\n"); - return -curr; + curr = -curr; } } - return curr; + return curr * 1000; } /*