Update 2.6.36 to 2.6.36.4wip-dissipation2-jerickso

3 files changed, 12 insertions, 5 deletions

diff --git a/drivers/power/ds2760_battery.c b/drivers/power/ds2760_battery.c
index 4d3b27228a2e..c8d26df9f145 100644
--- a/drivers/power/ds2760_battery.c
+++ b/drivers/power/ds2760_battery.c
@@ -212,7 +212,7 @@ static int ds2760_battery_read_status(struct ds2760_device_info *di)
         if (di->rem_capacity > 100)
                 di->rem_capacity = 100;
 
-        if (di->current_uA >= 100L)
+        if (di->current_uA < -100L)
                 di->life_sec = -((di->accum_current_uAh - di->empty_uAh) * 36L)
                                         / (di->current_uA / 100L);
         else
diff --git a/drivers/power/jz4740-battery.c b/drivers/power/jz4740-battery.c
index 20c4b952e9bd..a74cb0ac3d48 100644
--- a/drivers/power/jz4740-battery.c
+++ b/drivers/power/jz4740-battery.c
@@ -47,6 +47,8 @@ struct jz_battery {
 
         struct power_supply battery;
         struct delayed_work work;
+
+        struct mutex lock;
 };
 
 static inline struct jz_battery *psy_to_jz_battery(struct power_supply *psy)
@@ -68,6 +70,8 @@ static long jz_battery_read_voltage(struct jz_battery *battery)
         unsigned long val;
         long voltage;
 
+        mutex_lock(&battery->lock);
+
         INIT_COMPLETION(battery->read_completion);
 
         enable_irq(battery->irq);
@@ -91,6 +95,8 @@ static long jz_battery_read_voltage(struct jz_battery *battery)
         battery->cell->disable(battery->pdev);
         disable_irq(battery->irq);
 
+        mutex_unlock(&battery->lock);
+
         return voltage;
 }
 
@@ -291,6 +297,7 @@ static int __devinit jz_battery_probe(struct platform_device *pdev)
         jz_battery->pdev = pdev;
 
         init_completion(&jz_battery->read_completion);
+        mutex_init(&jz_battery->lock);
 
         INIT_DELAYED_WORK(&jz_battery->work, jz_battery_work);
 
diff --git a/drivers/power/olpc_battery.c b/drivers/power/olpc_battery.c
index aafc1c506eda..5bc1dcf7785e 100644
--- a/drivers/power/olpc_battery.c
+++ b/drivers/power/olpc_battery.c
@@ -271,14 +271,14 @@ static int olpc_bat_get_property(struct power_supply *psy,
                 if (ret)
                         return ret;
 
-                val->intval = (int)be16_to_cpu(ec_word) * 9760L / 32;
+                val->intval = (s16)be16_to_cpu(ec_word) * 9760L / 32;
                 break;
         case POWER_SUPPLY_PROP_CURRENT_AVG:
                 ret = olpc_ec_cmd(EC_BAT_CURRENT, NULL, 0, (void *)&ec_word, 2);
                 if (ret)
                         return ret;
 
-                val->intval = (int)be16_to_cpu(ec_word) * 15625L / 120;
+                val->intval = (s16)be16_to_cpu(ec_word) * 15625L / 120;
                 break;
         case POWER_SUPPLY_PROP_CAPACITY:
                 ret = olpc_ec_cmd(EC_BAT_SOC, NULL, 0, &ec_byte, 1);
@@ -299,7 +299,7 @@ static int olpc_bat_get_property(struct power_supply *psy,
                 if (ret)
                         return ret;
 
-                val->intval = (int)be16_to_cpu(ec_word) * 100 / 256;
+                val->intval = (s16)be16_to_cpu(ec_word) * 100 / 256;
                 break;
         case POWER_SUPPLY_PROP_TEMP_AMBIENT:
                 ret = olpc_ec_cmd(EC_AMB_TEMP, NULL, 0, (void *)&ec_word, 2);
@@ -313,7 +313,7 @@ static int olpc_bat_get_property(struct power_supply *psy,
                 if (ret)
                         return ret;
 
-                val->intval = (int)be16_to_cpu(ec_word) * 6250 / 15;
+                val->intval = (s16)be16_to_cpu(ec_word) * 6250 / 15;
                 break;
         case POWER_SUPPLY_PROP_SERIAL_NUMBER:
                 ret = olpc_ec_cmd(EC_BAT_SERIAL, NULL, 0, (void *)&ser_buf, 8);