diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
| commit | 95db6b748fc86297827fbd9c9ef174d491c9ad89 (patch) | |
| tree | 27a92a942821cde1edda9a1b088718d436b3efe4 /drivers/net/3c509.c | |
| parent | 45b27b0a0652331d104c953a5b192d843fff88f8 (diff) | |
Merge with Linux 2.3.40.
Diffstat (limited to 'drivers/net/3c509.c')
| -rw-r--r-- | drivers/net/3c509.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c index fbd4503bd..595d69b22 100644 --- a/drivers/net/3c509.c +++ b/drivers/net/3c509.c @@ -251,6 +251,7 @@ int el3_probe(struct net_device *dev) if (el3_debug > 2) { printk("3c529: irq %d ioaddr 0x%x ifport %d\n", irq, ioaddr, if_port); } + EL3WINDOW(0); for (i = 0; i < 3; i++) { phys_addr[i] = htons(read_eeprom(ioaddr, i)); } @@ -374,6 +375,7 @@ int el3_probe(struct net_device *dev) ((struct el3_private *)dev->priv)->mca_slot = mca_slot; ((struct el3_private *)dev->priv)->next_dev = el3_root_dev; + ((struct el3_private *)dev->priv)->lock = (spinlock_t) SPIN_LOCK_UNLOCKED; el3_root_dev = dev; if (el3_debug > 0) @@ -434,9 +436,6 @@ el3_open(struct net_device *dev) outw(RxReset, ioaddr + EL3_CMD); outw(SetStatusEnb | 0x00, ioaddr + EL3_CMD); - /* Set the spinlock before grabbing IRQ! */ - ((struct el3_private *)dev->priv)->lock = (spinlock_t) SPIN_LOCK_UNLOCKED; - if (request_irq(dev->irq, &el3_interrupt, 0, dev->name, dev)) { return -EAGAIN; } |