aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/marvell/sky2.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index bd3366267039..f14544c8d73f 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -2419,6 +2419,7 @@ static int sky2_change_mtu(struct net_device *dev, int new_mtu)
2419 2419
2420 imask = sky2_read32(hw, B0_IMSK); 2420 imask = sky2_read32(hw, B0_IMSK);
2421 sky2_write32(hw, B0_IMSK, 0); 2421 sky2_write32(hw, B0_IMSK, 0);
2422 sky2_read32(hw, B0_IMSK);
2422 2423
2423 dev->trans_start = jiffies; /* prevent tx timeout */ 2424 dev->trans_start = jiffies; /* prevent tx timeout */
2424 napi_disable(&hw->napi); 2425 napi_disable(&hw->napi);
@@ -3487,8 +3488,8 @@ static void sky2_all_down(struct sky2_hw *hw)
3487 int i; 3488 int i;
3488 3489
3489 if (hw->flags & SKY2_HW_IRQ_SETUP) { 3490 if (hw->flags & SKY2_HW_IRQ_SETUP) {
3490 sky2_read32(hw, B0_IMSK);
3491 sky2_write32(hw, B0_IMSK, 0); 3491 sky2_write32(hw, B0_IMSK, 0);
3492 sky2_read32(hw, B0_IMSK);
3492 3493
3493 synchronize_irq(hw->pdev->irq); 3494 synchronize_irq(hw->pdev->irq);
3494 napi_disable(&hw->napi); 3495 napi_disable(&hw->napi);