Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[karo-tx-linux.git] / drivers / power / intel_mid_battery.c

diff --git a/drivers/power/intel_mid_battery.c b/drivers/power/intel_mid_battery.c
index 46730f579d7fbc84cf8f699ac9e473d000cb4a86..c61ffec2ff106ca7aa153dac55cebf5a77b495b1 100644 (file)
--- a/drivers/power/intel_mid_battery.c
+++ b/drivers/power/intel_mid_battery.c
@@ -168,7 +168,7 @@ struct battery_property {
  */
 static int pmic_scu_ipc_battery_cc_read(u32 *value)
 {
-       return intel_scu_ipc_command(IPC_CMD_CC_RD, IPCMSG_BATTERY,
+       return intel_scu_ipc_command(IPCMSG_BATTERY, IPC_CMD_CC_RD,
                                        NULL, 0, value, 1);
 }
 
@@ -427,7 +427,7 @@ static int pmic_usb_get_property(struct power_supply *psy,
 static inline unsigned long mAStouAh(unsigned long v)
 {
        /* seconds to hours, mA to µA */
-       return v * 3600 * 1000;
+       return (v * 1000) / 3600;
 }
 
 /**