X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=drivers%2Fmailbox%2Fmailbox.c;h=afcb430508eceac7887ee436ec19c15fcfad89cd;hb=43e7406efd7822d75c64310461d2cbca0ece19f0;hp=9a937ef350680752eb4c5b4a70dfccd7d27d2f9f;hpb=ff114805e1dc9b64c1f2e02fbb07a6ed309b18d8;p=firefly-linux-kernel-4.4.55.git

diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c
index 9a937ef35068..afcb430508ec 100644
--- a/drivers/mailbox/mailbox.c
+++ b/drivers/mailbox/mailbox.c
@@ -126,7 +126,7 @@ static void poll_txdone(unsigned long data)
 
 	if (resched)
 		mod_timer(&mbox->poll, jiffies +
-				msecs_to_jiffies(mbox->period));
+				msecs_to_jiffies(mbox->txpoll_period));
 }
 
 /**
@@ -252,8 +252,6 @@ int mbox_send_message(struct mbox_chan *chan, void *mssg)
 
 	msg_submit(chan);
 
-	INIT_COMPLETION(chan->tx_complete);
-
 	if (chan->txdone_method	== TXDONE_BY_POLL)
 		poll_txdone((unsigned long)chan->mbox);