include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[safe/jmp/linux-2.6] / drivers / power / bq27x00_battery.c

diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
index 5d940fa..3ec9c6a 100644 (file)
--- a/drivers/power/bq27x00_battery.c
+++ b/drivers/power/bq27x00_battery.c
@@ -24,6 +24,7 @@
 #include <linux/power_supply.h>
 #include <linux/idr.h>
 #include <linux/i2c.h>
+#include <linux/slab.h>
 #include <asm/unaligned.h>
 
 #define DRIVER_VERSION                 "1.1.0"
@@ -125,7 +126,7 @@ static int bq27x00_battery_voltage(struct bq27x00_device_info *di)
                return ret;
        }
 
-       return volt;
+       return volt * 1000;
 }
 
 /*
@@ -156,11 +157,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;
 }
 
 /*