projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d1b113b
)
intel_pmic_battery: Fix battery charging status on mrst
author
Shuduo Sang
<
[email protected]
>
Tue, 24 Aug 2010 13:35:17 +0000
(14:35 +0100)
committer
Anton Vorontsov
<
[email protected]
>
Tue, 24 Aug 2010 14:27:57 +0000
(18:27 +0400)
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 <
[email protected]
>
Signed-off-by: Alan Cox <
[email protected]
>
Signed-off-by: Anton Vorontsov <
[email protected]
>
drivers/power/intel_mid_battery.c
patch
|
blob
|
history
diff --git
a/drivers/power/intel_mid_battery.c
b/drivers/power/intel_mid_battery.c
index c61ffec2ff106ca7aa153dac55cebf5a77b495b1..2a10cd361181292f9d6bbef7ef38cda9772c839b 100644
(file)
--- 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_PROPERT
Y,
- IPC
MSG_BATTER
Y, NULL, 0, data, 3);
+ int err = intel_scu_ipc_command(IPC
MSG_BATTER
Y,
+ IPC
_CMD_BATTERY_PROPERT
Y, 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
);
}
/**