diff options
Diffstat (limited to 'drivers/net/pcnet32.c')
-rw-r--r-- | drivers/net/pcnet32.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c index a43e24245b7e..36f9d988278f 100644 --- a/drivers/net/pcnet32.c +++ b/drivers/net/pcnet32.c | |||
@@ -304,7 +304,7 @@ static int pcnet32_open(struct net_device *); | |||
304 | static int pcnet32_init_ring(struct net_device *); | 304 | static int pcnet32_init_ring(struct net_device *); |
305 | static int pcnet32_start_xmit(struct sk_buff *, struct net_device *); | 305 | static int pcnet32_start_xmit(struct sk_buff *, struct net_device *); |
306 | static void pcnet32_tx_timeout(struct net_device *dev); | 306 | static void pcnet32_tx_timeout(struct net_device *dev); |
307 | static irqreturn_t pcnet32_interrupt(int, void *, struct pt_regs *); | 307 | static irqreturn_t pcnet32_interrupt(int, void *); |
308 | static int pcnet32_close(struct net_device *); | 308 | static int pcnet32_close(struct net_device *); |
309 | static struct net_device_stats *pcnet32_get_stats(struct net_device *); | 309 | static struct net_device_stats *pcnet32_get_stats(struct net_device *); |
310 | static void pcnet32_load_multicast(struct net_device *dev); | 310 | static void pcnet32_load_multicast(struct net_device *dev); |
@@ -674,7 +674,7 @@ static void pcnet32_purge_rx_ring(struct net_device *dev) | |||
674 | static void pcnet32_poll_controller(struct net_device *dev) | 674 | static void pcnet32_poll_controller(struct net_device *dev) |
675 | { | 675 | { |
676 | disable_irq(dev->irq); | 676 | disable_irq(dev->irq); |
677 | pcnet32_interrupt(0, dev, NULL); | 677 | pcnet32_interrupt(0, dev); |
678 | enable_irq(dev->irq); | 678 | enable_irq(dev->irq); |
679 | } | 679 | } |
680 | #endif | 680 | #endif |
@@ -2561,7 +2561,7 @@ static int pcnet32_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
2561 | 2561 | ||
2562 | /* The PCNET32 interrupt handler. */ | 2562 | /* The PCNET32 interrupt handler. */ |
2563 | static irqreturn_t | 2563 | static irqreturn_t |
2564 | pcnet32_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 2564 | pcnet32_interrupt(int irq, void *dev_id) |
2565 | { | 2565 | { |
2566 | struct net_device *dev = dev_id; | 2566 | struct net_device *dev = dev_id; |
2567 | struct pcnet32_private *lp; | 2567 | struct pcnet32_private *lp; |
@@ -2569,13 +2569,6 @@ pcnet32_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
2569 | u16 csr0; | 2569 | u16 csr0; |
2570 | int boguscnt = max_interrupt_work; | 2570 | int boguscnt = max_interrupt_work; |
2571 | 2571 | ||
2572 | if (!dev) { | ||
2573 | if (pcnet32_debug & NETIF_MSG_INTR) | ||
2574 | printk(KERN_DEBUG "%s(): irq %d for unknown device\n", | ||
2575 | __FUNCTION__, irq); | ||
2576 | return IRQ_NONE; | ||
2577 | } | ||
2578 | |||
2579 | ioaddr = dev->base_addr; | 2572 | ioaddr = dev->base_addr; |
2580 | lp = dev->priv; | 2573 | lp = dev->priv; |
2581 | 2574 | ||