diff options
| author | Sudeep Holla <sudeep.holla@arm.com> | 2017-03-21 11:30:16 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-06 18:59:42 -0700 |
| commit | 016a638a518c828719147e2f2d9cd9a0941fe6dd (patch) | |
| tree | 392044d28900cdf20b608d8d7097e50fe890055f | |
| parent | abe9090ac07b1294c88686336ea881e833312a9e (diff) | |
| download | linux-stable-016a638a518c828719147e2f2d9cd9a0941fe6dd.tar.gz linux-stable-016a638a518c828719147e2f2d9cd9a0941fe6dd.tar.bz2 linux-stable-016a638a518c828719147e2f2d9cd9a0941fe6dd.zip | |
mailbox: handle empty message in tx_tick
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/mailbox/mailbox.c | 5 |
1 files changed, 4 insertions, 1 deletions
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) |