Merge git://git.infradead.org/battery-2.6

[pandora-kernel.git] / drivers / power / ds2760_battery.c

diff --git a/drivers/power/ds2760_battery.c b/drivers/power/ds2760_battery.c
index e534290..f2c9cc3 100644 (file)
--- a/drivers/power/ds2760_battery.c
+++ b/drivers/power/ds2760_battery.c
@@ -86,7 +86,11 @@ static int rated_capacities[] = {
        920,    /* NEC */
        1440,   /* Samsung */
        1440,   /* BYD */
+#ifdef CONFIG_MACH_H4700
+       1800,   /* HP iPAQ hx4700 3.7V 1800mAh (359113-001) */
+#else
        1440,   /* Lishen */
+#endif
        1440,   /* NEC */
        2880,   /* Samsung */
        2880,   /* BYD */
@@ -186,7 +190,7 @@ static int ds2760_battery_read_status(struct ds2760_device_info *di)
 
        scale[0] = di->full_active_uAh;
        for (i = 1; i < 5; i++)
-               scale[i] = scale[i - 1] + di->raw[DS2760_ACTIVE_FULL + 2 + i];
+               scale[i] = scale[i - 1] + di->raw[DS2760_ACTIVE_FULL + 1 + i];
 
        di->full_active_uAh = battery_interpolate(scale, di->temp_C / 10);
        di->full_active_uAh *= 1000; /* convert to µAh */