[for-3.18,14/15] mailbox: handle empty message in tx_tick

Message ID 1501015526-32178-15-git-send-email-amit.pundir@linaro.org
State New
Headers show
  • Stable candidates for 3.18.y
Related show

Commit Message

Amit Pundir July 25, 2017, 8:45 p.m.
From: Sudeep Holla <sudeep.holla@arm.com>

commit cb710ab1d8a23f68ff8f45aedf3e552bb90e70de upstream.

We already check if the message is empty before calling the client
tx_done callback. Calling completion on a wait event is also invalid
if the message is empty.

This patch moves the existing empty message check earlier.

Fixes: 2b6d83e2b8b7 ("mailbox: Introduce framework for mailbox")
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

 drivers/mailbox/mailbox.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)



diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c
index cbde6fccbc29..e464ff084e82 100644
--- a/drivers/mailbox/mailbox.c
+++ b/drivers/mailbox/mailbox.c
@@ -99,8 +99,11 @@  static void tx_tick(struct mbox_chan *chan, int r)
 	/* Submit next message */
+	if (!mssg)
+		return;
 	/* Notify the client */
-	if (mssg && chan->cl->tx_done)
+	if (chan->cl->tx_done)
 		chan->cl->tx_done(chan->cl, mssg, r);
 	if (r != -ETIME && chan->cl->tx_block)