Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 77f4b9fe050d59a30c3b11e267289630bb13f56a

Authored by Shuduo Sang
Committed by Anton Vorontsov
1 parent d1b113bb02
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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>

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

drivers/power/intel_mid_battery.c
Diff comments   View file @ 77f4b9f
... ... @@ -185,8 +185,8 @@
185 185 {
186 186 u32 data[3];
187 187 u8 *p = (u8 *)&data[1];
188   - int err = intel_scu_ipc_command(IPC_CMD_BATTERY_PROPERTY,
189   - IPCMSG_BATTERY, NULL, 0, data, 3);
  188 + int err = intel_scu_ipc_command(IPCMSG_BATTERY,
  189 + IPC_CMD_BATTERY_PROPERTY, NULL, 0, data, 3);
190 190  
191 191 prop->capacity = data[0];
192 192 prop->crnt = *p++;
... ... @@ -207,7 +207,7 @@
207 207  
208 208 static int pmic_scu_ipc_set_charger(int charger)
209 209 {
210   - return intel_scu_ipc_simple_command(charger, IPCMSG_BATTERY);
  210 + return intel_scu_ipc_simple_command(IPCMSG_BATTERY, charger);
211 211 }
212 212  
213 213 /**