From 70621d772e84bfc1c565c6d0a4e92349dcf25560 Mon Sep 17 00:00:00 2001 From: Jon Benson Date: Sat, 16 Oct 2010 14:12:59 +1100 Subject: [PATCH] Revert "fixs hang with phone caused by new Markinus commits" Markinus has a fix in the main tree so reverting ready to use that instead. This reverts commit fce8064242c6e552462893e33f4a245a409e63d5. --- arch/arm/mach-msm/smd_rpcrouter.c | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/arch/arm/mach-msm/smd_rpcrouter.c b/arch/arm/mach-msm/smd_rpcrouter.c index 348fb5f0..28771d10 100644 --- a/arch/arm/mach-msm/smd_rpcrouter.c +++ b/arch/arm/mach-msm/smd_rpcrouter.c @@ -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;