diff options
Diffstat (limited to 'drivers/net/tokenring/smctr.c')
-rw-r--r-- | drivers/net/tokenring/smctr.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c index 85a7f797d343..46dabdb12071 100644 --- a/drivers/net/tokenring/smctr.c +++ b/drivers/net/tokenring/smctr.c | |||
@@ -141,7 +141,7 @@ static int smctr_init_shared_memory(struct net_device *dev); | |||
141 | static int smctr_init_tx_bdbs(struct net_device *dev); | 141 | static int smctr_init_tx_bdbs(struct net_device *dev); |
142 | static int smctr_init_tx_fcbs(struct net_device *dev); | 142 | static int smctr_init_tx_fcbs(struct net_device *dev); |
143 | static int smctr_internal_self_test(struct net_device *dev); | 143 | static int smctr_internal_self_test(struct net_device *dev); |
144 | static irqreturn_t smctr_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 144 | static irqreturn_t smctr_interrupt(int irq, void *dev_id); |
145 | static int smctr_issue_enable_int_cmd(struct net_device *dev, | 145 | static int smctr_issue_enable_int_cmd(struct net_device *dev, |
146 | __u16 interrupt_enable_mask); | 146 | __u16 interrupt_enable_mask); |
147 | static int smctr_issue_int_ack(struct net_device *dev, __u16 iack_code, | 147 | static int smctr_issue_int_ack(struct net_device *dev, __u16 iack_code, |
@@ -1980,7 +1980,7 @@ static int smctr_internal_self_test(struct net_device *dev) | |||
1980 | /* | 1980 | /* |
1981 | * The typical workload of the driver: Handle the network interface interrupts. | 1981 | * The typical workload of the driver: Handle the network interface interrupts. |
1982 | */ | 1982 | */ |
1983 | static irqreturn_t smctr_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 1983 | static irqreturn_t smctr_interrupt(int irq, void *dev_id) |
1984 | { | 1984 | { |
1985 | struct net_device *dev = dev_id; | 1985 | struct net_device *dev = dev_id; |
1986 | struct net_local *tp; | 1986 | struct net_local *tp; |
@@ -1990,15 +1990,8 @@ static irqreturn_t smctr_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
1990 | __u8 isb_type, isb_subtype; | 1990 | __u8 isb_type, isb_subtype; |
1991 | __u16 isb_index; | 1991 | __u16 isb_index; |
1992 | 1992 | ||
1993 | if(dev == NULL) | ||
1994 | { | ||
1995 | printk(KERN_CRIT "%s: irq %d for unknown device.\n", dev->name, irq); | ||
1996 | return IRQ_NONE; | ||
1997 | } | ||
1998 | |||
1999 | ioaddr = dev->base_addr; | 1993 | ioaddr = dev->base_addr; |
2000 | tp = netdev_priv(dev); | 1994 | tp = netdev_priv(dev); |
2001 | |||
2002 | 1995 | ||
2003 | if(tp->status == NOT_INITIALIZED) | 1996 | if(tp->status == NOT_INITIALIZED) |
2004 | return IRQ_NONE; | 1997 | return IRQ_NONE; |