htcleo: fixed wrong rpc fix for haret boot

This commit is contained in:
Markinus 2010-10-15 16:34:27 +02:00
parent 3ae4c93cd7
commit b62e71c35a

View File

@ -143,19 +143,15 @@ 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) {
printk(KERN_ERR "rpcrouter_send_control_msg(): Warning, "
"router not initialized\n");
return -EINVAL;
}
if (!(msg->cmd == RPCROUTER_CTRL_CMD_HELLO) && !initialized
#if defined(CONFIG_MACH_HTCLEO)
if ((msg->cmd == RPCROUTER_CTRL_CMD_BYE) && !initialized && !htcleo_is_nand_boot())
{
&& (!(msg->cmd == RPCROUTER_CTRL_CMD_BYE) && !htcleo_is_nand_boot())
#endif
) {
printk(KERN_ERR "rpcrouter_send_control_msg(): Warning, "
"router not initialized\n");
return -EINVAL;
}
#endif
hdr.version = RPCROUTER_VERSION;
hdr.type = msg->cmd;