android/android_kernel_cmhtcleo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "fixs hang with phone caused by new Markinus commits"

Browse Source 
Markinus has a fix in the main tree so reverting ready to use that instead.

This reverts commit fce8064242.
This commit is contained in:
Jon Benson 2010-10-16 14:12:59 +11:00
parent f88e03fbb0
commit 70621d772e
1 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
arch/arm/mach-msm/smd_rpcrouter.c
View File

@ -143,7 +143,7 @@ static int rpcrouter_send_control_msg(union rr_control_msg *msg)
RR("send control message cmd=%d srv.cmd=%d prog=%08x:%x id=%d:%08x\n", msg->cmd, msg->srv.cmd, msg->srv.prog, msg->srv.vers, msg->srv.pid, msg->srv.cid);
/* if (!(msg->cmd == RPCROUTER_CTRL_CMD_HELLO) && !initialized) {
if (!(msg->cmd == RPCROUTER_CTRL_CMD_HELLO) && !initialized) {
printk(KERN_ERR "rpcrouter_send_control_msg(): Warning, "
"router not initialized\n");
return -EINVAL;
@ -155,31 +155,8 @@ static int rpcrouter_send_control_msg(union rr_control_msg *msg)
"router not initialized\n");
return -EINVAL;
}
#endif */
#if defined(CONFIG_MACH_HTCLEO)
if (!htcleo_is_nand_boot())
{
#endif
if (!(msg->cmd == RPCROUTER_CTRL_CMD_HELLO
#if defined(CONFIG_MACH_HTCLEO)
|| msg->cmd == RPCROUTER_CTRL_CMD_BYE
#endif
) && !initialized) {
printk(KERN_ERR "rpcrouter_send_control_msg(): Warning, "
"router not initialized\n");
return -EINVAL;
}
#if defined(CONFIG_MACH_HTCLEO)
}
else
{
if (!(msg->cmd == RPCROUTER_CTRL_CMD_HELLO) && !initialized) {
printk(KERN_ERR "rpcrouter_send_control_msg(): Warning, "
"router not initialized\n");
return -EINVAL;
}
}
#endif
#endif
hdr.version = RPCROUTER_VERSION;
hdr.type = msg->cmd;
hdr.src_pid = RPCROUTER_PID_LOCAL;