diff options
| author | Andrew Jeffery <andrew@aj.id.au> | 2017-04-24 16:15:06 +0930 |
|---|---|---|
| committer | Andrew Jeffery <andrew@aj.id.au> | 2017-04-24 16:21:04 +0930 |
| commit | 121dc0d6bc3ce93017cb20433016c66ef7580985 (patch) | |
| tree | 2b7251bb370b5745d921fe48aced82229acc079e /mboxd_msg.c | |
| parent | 591b817fb89d77b65be0f3e8fe9b26a9f6c49efa (diff) | |
| download | phosphor-mboxd-121dc0d6bc3ce93017cb20433016c66ef7580985.tar.gz phosphor-mboxd-121dc0d6bc3ce93017cb20433016c66ef7580985.zip | |
mbox_msg: Cleanup error strings and whitespace
Change-Id: I6f432ef1b8c6b490c368cccc52044bef300bde84
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Diffstat (limited to 'mboxd_msg.c')
| -rw-r--r-- | mboxd_msg.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mboxd_msg.c b/mboxd_msg.c index 84e8d9a..9f8aba1 100644 --- a/mboxd_msg.c +++ b/mboxd_msg.c @@ -659,9 +659,10 @@ static int mbox_handle_ack(struct mbox_context *context, union mbox_regs *req, static int check_cmd_valid(struct mbox_context *context, int cmd) { if (cmd <= 0 || cmd > NUM_MBOX_CMDS) { - MSG_ERR("UNKNOWN MBOX COMMAND: %d\n", cmd); + MSG_ERR("Unknown mbox command: %d\n", cmd); return -MBOX_R_PARAM_ERROR; } + if (context->state & STATE_SUSPENDED) { if (cmd != MBOX_C_GET_MBOX_INFO && cmd != MBOX_C_ACK) { MSG_ERR("Cannot use that cmd while suspended: %d\n", @@ -670,11 +671,11 @@ static int check_cmd_valid(struct mbox_context *context, int cmd) : -MBOX_R_PARAM_ERROR; } } + if (!(context->state & MAPS_MEM)) { if (cmd != MBOX_C_RESET_STATE && cmd != MBOX_C_GET_MBOX_INFO && cmd != MBOX_C_ACK) { - MSG_ERR("Must call GET_MBOX_INFO before that cmd: %d\n", - cmd); + MSG_ERR("Must call GET_MBOX_INFO before %d\n", cmd); return -MBOX_R_PARAM_ERROR; } } |
