aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-08-22 13:31:23 -0500
committerMark Brown <broonie@linaro.org>2014-08-22 13:31:23 -0500
commit586197edd648635f892870b1c4f726496a8dcb6c (patch)
tree3ebe3a612fe89ca85edc8a8e4405ebd99206f2d4
parent5fa06ef3905aa942f0ed558d4450ba140a056c8f (diff)
parente20790cdd69e8c490bc4799c7d0e8f5112b0db89 (diff)
Merge remote-tracking branch 'lsk/v3.14/topic/mailbox' into linux-linaro-lsk-v3.14
-rw-r--r--drivers/mailbox/mailbox.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c
index 9a937ef35068..63ecc1723466 100644
--- a/drivers/mailbox/mailbox.c
+++ b/drivers/mailbox/mailbox.c
@@ -252,7 +252,7 @@ int mbox_send_message(struct mbox_chan *chan, void *mssg)
msg_submit(chan);
- INIT_COMPLETION(chan->tx_complete);
+ reinit_completion(&chan->tx_complete);
if (chan->txdone_method == TXDONE_BY_POLL)
poll_txdone((unsigned long)chan->mbox);