Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[karo-tx-linux.git] / drivers / net / ethernet / marvell / sky2.c

diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index f8ab220bd72cc831eabdaf832b3ffbd5d059b5b2..867a6a3ef81f72c4c9da17ea861ab1bf30628833 100644 (file)
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -2416,6 +2416,7 @@ static int sky2_change_mtu(struct net_device *dev, int new_mtu)
 
        imask = sky2_read32(hw, B0_IMSK);
        sky2_write32(hw, B0_IMSK, 0);
+       sky2_read32(hw, B0_IMSK);
 
        dev->trans_start = jiffies;     /* prevent tx timeout */
        napi_disable(&hw->napi);
@@ -3484,8 +3485,8 @@ static void sky2_all_down(struct sky2_hw *hw)
        int i;
 
        if (hw->flags & SKY2_HW_IRQ_SETUP) {
-               sky2_read32(hw, B0_IMSK);
                sky2_write32(hw, B0_IMSK, 0);
+               sky2_read32(hw, B0_IMSK);
 
                synchronize_irq(hw->pdev->irq);
                napi_disable(&hw->napi);