diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/natsemi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index c6172a77a6d7..2888880df3b7 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c | |||
@@ -1712,7 +1712,7 @@ static void init_registers(struct net_device *dev) | |||
1712 | 1712 | ||
1713 | /* Enable interrupts by setting the interrupt mask. */ | 1713 | /* Enable interrupts by setting the interrupt mask. */ |
1714 | writel(DEFAULT_INTR, ioaddr + IntrMask); | 1714 | writel(DEFAULT_INTR, ioaddr + IntrMask); |
1715 | writel(1, ioaddr + IntrEnable); | 1715 | natsemi_irq_enable(dev); |
1716 | 1716 | ||
1717 | writel(RxOn | TxOn, ioaddr + ChipCmd); | 1717 | writel(RxOn | TxOn, ioaddr + ChipCmd); |
1718 | writel(StatsClear, ioaddr + StatsCtrl); /* Clear Stats */ | 1718 | writel(StatsClear, ioaddr + StatsCtrl); /* Clear Stats */ |
@@ -3071,7 +3071,7 @@ static void enable_wol_mode(struct net_device *dev, int enable_intr) | |||
3071 | * Could be used to send a netlink message. | 3071 | * Could be used to send a netlink message. |
3072 | */ | 3072 | */ |
3073 | writel(WOLPkt | LinkChange, ioaddr + IntrMask); | 3073 | writel(WOLPkt | LinkChange, ioaddr + IntrMask); |
3074 | writel(1, ioaddr + IntrEnable); | 3074 | natsemi_irq_enable(dev); |
3075 | } | 3075 | } |
3076 | } | 3076 | } |
3077 | 3077 | ||
@@ -3202,7 +3202,7 @@ static int natsemi_suspend (struct pci_dev *pdev, pm_message_t state) | |||
3202 | disable_irq(dev->irq); | 3202 | disable_irq(dev->irq); |
3203 | spin_lock_irq(&np->lock); | 3203 | spin_lock_irq(&np->lock); |
3204 | 3204 | ||
3205 | writel(0, ioaddr + IntrEnable); | 3205 | natsemi_irq_disable(dev); |
3206 | np->hands_off = 1; | 3206 | np->hands_off = 1; |
3207 | natsemi_stop_rxtx(dev); | 3207 | natsemi_stop_rxtx(dev); |
3208 | netif_stop_queue(dev); | 3208 | netif_stop_queue(dev); |