1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c
index 537f4f6d009b..674b35f402f5 100644
--- a/drivers/mailbox/mailbox.c
+++ b/drivers/mailbox/mailbox.c
@@ -351,7 +351,7 @@ struct mbox_chan *mbox_request_channel(struct mbox_client *cl, int index)
         init_completion(&chan->tx_complete);
 
         if (chan->txdone_method == TXDONE_BY_POLL && cl->knows_txdone)
-                chan->txdone_method |= TXDONE_BY_ACK;
+                chan->txdone_method = TXDONE_BY_ACK;
 
         spin_unlock_irqrestore(&chan->lock, flags);
 
@@ -418,7 +418,7 @@ void mbox_free_channel(struct mbox_chan *chan)
         spin_lock_irqsave(&chan->lock, flags);
         chan->cl = NULL;
         chan->active_req = NULL;
-        if (chan->txdone_method == (TXDONE_BY_POLL | TXDONE_BY_ACK))
+        if (chan->txdone_method == TXDONE_BY_ACK)
                 chan->txdone_method = TXDONE_BY_POLL;
 
         module_put(chan->mbox->dev->driver->owner);