diff options
Diffstat (limited to 'drivers/net/tulip/de4x5.c')
-rw-r--r-- | drivers/net/tulip/de4x5.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c index fb5fa7d68888..3f4b6408b755 100644 --- a/drivers/net/tulip/de4x5.c +++ b/drivers/net/tulip/de4x5.c | |||
@@ -896,7 +896,7 @@ static struct { | |||
896 | */ | 896 | */ |
897 | static int de4x5_open(struct net_device *dev); | 897 | static int de4x5_open(struct net_device *dev); |
898 | static int de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev); | 898 | static int de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev); |
899 | static irqreturn_t de4x5_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 899 | static irqreturn_t de4x5_interrupt(int irq, void *dev_id); |
900 | static int de4x5_close(struct net_device *dev); | 900 | static int de4x5_close(struct net_device *dev); |
901 | static struct net_device_stats *de4x5_get_stats(struct net_device *dev); | 901 | static struct net_device_stats *de4x5_get_stats(struct net_device *dev); |
902 | static void de4x5_local_stats(struct net_device *dev, char *buf, int pkt_len); | 902 | static void de4x5_local_stats(struct net_device *dev, char *buf, int pkt_len); |
@@ -1538,18 +1538,14 @@ de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev) | |||
1538 | ** interrupt is asserted and this routine entered. | 1538 | ** interrupt is asserted and this routine entered. |
1539 | */ | 1539 | */ |
1540 | static irqreturn_t | 1540 | static irqreturn_t |
1541 | de4x5_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 1541 | de4x5_interrupt(int irq, void *dev_id) |
1542 | { | 1542 | { |
1543 | struct net_device *dev = (struct net_device *)dev_id; | 1543 | struct net_device *dev = dev_id; |
1544 | struct de4x5_private *lp; | 1544 | struct de4x5_private *lp; |
1545 | s32 imr, omr, sts, limit; | 1545 | s32 imr, omr, sts, limit; |
1546 | u_long iobase; | 1546 | u_long iobase; |
1547 | unsigned int handled = 0; | 1547 | unsigned int handled = 0; |
1548 | 1548 | ||
1549 | if (dev == NULL) { | ||
1550 | printk ("de4x5_interrupt(): irq %d for unknown device.\n", irq); | ||
1551 | return IRQ_NONE; | ||
1552 | } | ||
1553 | lp = netdev_priv(dev); | 1549 | lp = netdev_priv(dev); |
1554 | spin_lock(&lp->lock); | 1550 | spin_lock(&lp->lock); |
1555 | iobase = dev->base_addr; | 1551 | iobase = dev->base_addr; |