renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 12:43:55 +08:00
Code

ipc: Handle error conditions in ipc command

Browse Source 
Handle error conditions in intel_scu_ipc_command() and
pwr_reg_rdwr().

Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Signed-off-by: David Cohen <david.a.cohen@linux.intel.com>
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
This commit is contained in:
Kuppuswamy Sathyanarayanan 2013-11-14 14:15:06 -08:00 committed by Matthew Garrett
parent 7f95afb317
commit c7094d1d99
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/platform/x86/intel_scu_ipc.c
View File

@ -235,7 +235,7 @@ static int pwr_reg_rdwr(u16 *addr, u8 *data, u32 count, u32 op, u32 id)
} }
err = busy_loop(); err = busy_loop();
if (id == IPC_CMD_PCNTRL_R) { /* Read rbuf */ if (!err && id == IPC_CMD_PCNTRL_R) { /* Read rbuf */
/* Workaround: values are read as 0 without memcpy_fromio */ /* Workaround: values are read as 0 without memcpy_fromio */
memcpy_fromio(cbuf, ipcdev.ipc_base + 0x90, 16); memcpy_fromio(cbuf, ipcdev.ipc_base + 0x90, 16);
for (nc = 0; nc < count; nc++) for (nc = 0; nc < count; nc++)
@ -465,8 +465,10 @@ int intel_scu_ipc_command(int cmd, int sub, u32 *in, int inlen,
ipc_command((inlen << 16) | (sub << 12) | cmd); ipc_command((inlen << 16) | (sub << 12) | cmd);
err = busy_loop(); err = busy_loop();
for (i = 0; i < outlen; i++) if (!err) {
*out++ = ipc_data_readl(4 * i); for (i = 0; i < outlen; i++)
*out++ = ipc_data_readl(4 * i);
}
mutex_unlock(&ipclock); mutex_unlock(&ipclock);
return err; return err;