aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown2014-08-22 13:32:19 -0500
committerMark Brown2014-08-22 13:32:19 -0500
commit8854fda33d4cc47b3815705ce96468713a500fed (patch)
treeafe2abb23a89109ba597bed1a8c6dceabb9e97af
parent404173b78d419ba0ab637b965e8e08ce2e6af474 (diff)
parent586197edd648635f892870b1c4f726496a8dcb6c (diff)
downloadkernel-video-8854fda33d4cc47b3815705ce96468713a500fed.tar.gz
kernel-video-8854fda33d4cc47b3815705ce96468713a500fed.tar.xz
kernel-video-8854fda33d4cc47b3815705ce96468713a500fed.zip
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
-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 9a937ef3506..63ecc172346 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)
252 252
253 msg_submit(chan); 253 msg_submit(chan);
254 254
255 INIT_COMPLETION(chan->tx_complete); 255 reinit_completion(&chan->tx_complete);
256 256
257 if (chan->txdone_method == TXDONE_BY_POLL) 257 if (chan->txdone_method == TXDONE_BY_POLL)
258 poll_txdone((unsigned long)chan->mbox); 258 poll_txdone((unsigned long)chan->mbox);