diff mbox series

[for-4.9,09/10] mailbox: handle empty message in tx_tick

Message ID 1501010956-27944-10-git-send-email-amit.pundir@linaro.org
State Superseded
Headers show
Series Stable candidates for 4.9.y | expand

Commit Message

Amit Pundir July 25, 2017, 7:29 p.m. UTC 
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(-)

-- 
2.7.4
diff mbox series

Patch

diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c
index 77ac049e51b6..87ef465c6947 100644
--- a/drivers/mailbox/mailbox.c
+++ b/drivers/mailbox/mailbox.c
@@ -104,8 +104,11 @@  static void tx_tick(struct mbox_chan *chan, int r)
 	/* Submit next message */
 	msg_submit(chan);
 
+	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)