diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-15 18:15:17 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-15 18:15:17 -0400 |
| commit | c337ffb68e1e71bad069b14d2246fa1e0c31699c (patch) | |
| tree | 7861a59b196adfd63758cc0921e4fb56030fbaf3 /drivers/net/ariadne.c | |
| parent | 30df754dedebf27ef90452944a723ba058d23396 (diff) | |
| parent | 84c0c6933cb0303fa006992a6659c2b46de4eb17 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/ariadne.c')
| -rw-r--r-- | drivers/net/ariadne.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c index 39214e51245..7ca0eded256 100644 --- a/drivers/net/ariadne.c +++ b/drivers/net/ariadne.c | |||
| @@ -425,11 +425,6 @@ static irqreturn_t ariadne_interrupt(int irq, void *data) | |||
| 425 | int csr0, boguscnt; | 425 | int csr0, boguscnt; |
| 426 | int handled = 0; | 426 | int handled = 0; |
| 427 | 427 | ||
| 428 | if (dev == NULL) { | ||
| 429 | printk(KERN_WARNING "ariadne_interrupt(): irq for unknown device.\n"); | ||
| 430 | return IRQ_NONE; | ||
| 431 | } | ||
| 432 | |||
| 433 | lance->RAP = CSR0; /* PCnet-ISA Controller Status */ | 428 | lance->RAP = CSR0; /* PCnet-ISA Controller Status */ |
| 434 | 429 | ||
| 435 | if (!(lance->RDP & INTR)) /* Check if any interrupt has been */ | 430 | if (!(lance->RDP & INTR)) /* Check if any interrupt has been */ |