diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-10-06 15:27:31 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-10-06 15:27:31 -0400 |
commit | 5d347c8abaab1e8c24272a53099c22482855783e (patch) | |
tree | 3e267ced787b4ae18dd2c6275c1b8a83884f96b6 /drivers/net/skfp | |
parent | e317c8ccaaf900abf39cc3240e4dc5ba82a3cc67 (diff) | |
parent | d87dbede030d17770aa6a6170e70ab6f8044e5ae (diff) |
Merge branch 'submit1' of viper:/spare/repo/irq-remove-2.6 into irqcleanups
Diffstat (limited to 'drivers/net/skfp')
-rw-r--r-- | drivers/net/skfp/skfddi.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c index 06ea2626c6f4..9733a11c6146 100644 --- a/drivers/net/skfp/skfddi.c +++ b/drivers/net/skfp/skfddi.c | |||
@@ -616,15 +616,10 @@ static int skfp_close(struct net_device *dev) | |||
616 | 616 | ||
617 | irqreturn_t skfp_interrupt(int irq, void *dev_id) | 617 | irqreturn_t skfp_interrupt(int irq, void *dev_id) |
618 | { | 618 | { |
619 | struct net_device *dev = (struct net_device *) dev_id; | 619 | struct net_device *dev = dev_id; |
620 | struct s_smc *smc; /* private board structure pointer */ | 620 | struct s_smc *smc; /* private board structure pointer */ |
621 | skfddi_priv *bp; | 621 | skfddi_priv *bp; |
622 | 622 | ||
623 | if (dev == NULL) { | ||
624 | printk("%s: irq %d for unknown device\n", dev->name, irq); | ||
625 | return IRQ_NONE; | ||
626 | } | ||
627 | |||
628 | smc = netdev_priv(dev); | 623 | smc = netdev_priv(dev); |
629 | bp = &smc->os; | 624 | bp = &smc->os; |
630 | 625 | ||