diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 04:59:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 04:59:46 -0400 |
| commit | 701328a7b58d50d8640c21ba5fdf3170b1ddac16 (patch) | |
| tree | 99a3fe44310a97e92ad1cb3a01f2ee3f6ed0d59a /drivers/net/wan/sdla.c | |
| parent | 53e36ada37cb8b01cfbf674580a79edc0bb764c7 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/wan/sdla.c')
| -rw-r--r-- | drivers/net/wan/sdla.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c index 5715d25271f1..6a485f0556f4 100644 --- a/drivers/net/wan/sdla.c +++ b/drivers/net/wan/sdla.c | |||
| @@ -875,13 +875,7 @@ static irqreturn_t sdla_isr(int irq, void *dev_id) | |||
| 875 | 875 | ||
| 876 | dev = dev_id; | 876 | dev = dev_id; |
| 877 | 877 | ||
| 878 | if (dev == NULL) | 878 | flp = netdev_priv(dev); |
| 879 | { | ||
| 880 | printk(KERN_WARNING "sdla_isr(): irq %d for unknown device.\n", irq); | ||
| 881 | return IRQ_NONE; | ||
| 882 | } | ||
| 883 | |||
| 884 | flp = dev->priv; | ||
| 885 | 879 | ||
| 886 | if (!flp->initialized) | 880 | if (!flp->initialized) |
| 887 | { | 881 | { |