summaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorShuduo Sang <shuduo.sang@intel.com>2010-08-24 17:35:17 +0400
committerAnton Vorontsov <cbouatmailru@gmail.com>2010-08-24 18:27:57 +0400
commit77f4b9fe050d59a30c3b11e267289630bb13f56a (patch)
treeca4809d3d42a4c2327141b4bdd86f09a698696cc /drivers/power
parentd1b113bb028999e82a8528e1484be8c23fb5a7d9 (diff)
downloadlinux-77f4b9fe050d59a30c3b11e267289630bb13f56a.tar.xz
intel_pmic_battery: Fix battery charging status on mrst
The arguments got swapped on some functions which produces undefined results. The main one got fixed before submit but the other two were missed. Signed-off-by: Shuduo Sang <shuduo.sang@intel.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/intel_mid_battery.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/power/intel_mid_battery.c b/drivers/power/intel_mid_battery.c
index c61ffec2ff10..2a10cd361181 100644
--- a/drivers/power/intel_mid_battery.c
+++ b/drivers/power/intel_mid_battery.c
@@ -185,8 +185,8 @@ static int pmic_scu_ipc_battery_property_get(struct battery_property *prop)
{
u32 data[3];
u8 *p = (u8 *)&data[1];
- int err = intel_scu_ipc_command(IPC_CMD_BATTERY_PROPERTY,
- IPCMSG_BATTERY, NULL, 0, data, 3);
+ int err = intel_scu_ipc_command(IPCMSG_BATTERY,
+ IPC_CMD_BATTERY_PROPERTY, NULL, 0, data, 3);
prop->capacity = data[0];
prop->crnt = *p++;
@@ -207,7 +207,7 @@ static int pmic_scu_ipc_battery_property_get(struct battery_property *prop)
static int pmic_scu_ipc_set_charger(int charger)
{
- return intel_scu_ipc_simple_command(charger, IPCMSG_BATTERY);
+ return intel_scu_ipc_simple_command(IPCMSG_BATTERY, charger);
}
/**