igb: reconfigure mailbox timeout logic

This change updates the timeout logic so that it is not possible to have a
sucessful check for message and still return an error if countdown = 0.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Reported-by: Juha Leppanen <juha_motorsportscom@luukku.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/igb/e1000_mbx.c b/drivers/net/igb/e1000_mbx.c
index 840782fb573659ea85c06cd104611b6217b774e2..ed9058eca45cc80cc8386e1b913e44b0b299975e 100644 (file)
--- a/drivers/net/igb/e1000_mbx.c
+++ b/drivers/net/igb/e1000_mbx.c
@@ -140,13 +140,13 @@ static s32 igb_poll_for_msg(struct e1000_hw *hw, u16 mbx_id)
        struct e1000_mbx_info *mbx = &hw->mbx;
        int countdown = mbx->timeout;
 
-       if (!mbx->ops.check_for_msg)
+       if (!countdown || !mbx->ops.check_for_msg)
                goto out;
 
        while (mbx->ops.check_for_msg(hw, mbx_id)) {
+               countdown--;
                if (!countdown)
                        break;
-               countdown--;
                udelay(mbx->usec_delay);
        }
 out:
@@ -165,13 +165,13 @@ static s32 igb_poll_for_ack(struct e1000_hw *hw, u16 mbx_id)
        struct e1000_mbx_info *mbx = &hw->mbx;
        int countdown = mbx->timeout;
 
-       if (!mbx->ops.check_for_ack)
+       if (!countdown || !mbx->ops.check_for_ack)
                goto out;
 
        while (mbx->ops.check_for_ack(hw, mbx_id)) {
+               countdown--;
                if (!countdown)
                        break;
-               countdown--;
                udelay(mbx->usec_delay);
        }
 out: