diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-25 05:30:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-25 05:30:00 +0000 |
| commit | ee355114ec6062d00c1376b184b886a39e74fd4e (patch) | |
| tree | da9330872894208b121ac18e2abbc801b67f1509 /drivers/net | |
| parent | d1003cbd87479d4962fe017c0f913dde9c4d026a (diff) | |
Merge with Linux 2.4.0-test6-pre9.
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/82596.c | 2 | ||||
| -rw-r--r-- | drivers/net/eth16i.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/82596.c b/drivers/net/82596.c index 6a458a39c..dfb1186ec 100644 --- a/drivers/net/82596.c +++ b/drivers/net/82596.c @@ -707,7 +707,7 @@ static int init_i596_mem(struct net_device *dev) spin_lock_irqsave (&lp->lock, flags); if (wait_cmd(dev,lp,1000,"timed out waiting to issue RX_START")) { - spin_unlock_irqrestore ((&lp->lock, flags); + spin_unlock_irqrestore (&lp->lock, flags); goto failed; } DEB(DEB_INIT,printk("%s: Issuing RX_START\n", dev->name)); diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c index 96d8058b8..d1927ff70 100644 --- a/drivers/net/eth16i.c +++ b/drivers/net/eth16i.c @@ -663,7 +663,7 @@ static int eth16i_probe_port(int ioaddr) { int i; int retcode; - unsigned char dummy_packet[64] = { 0 }; + unsigned char dummy_packet[64]; /* Powerup the chip */ outb(0xc0 | POWERUP, ioaddr + CONFIG_REG_1); @@ -679,6 +679,7 @@ static int eth16i_probe_port(int ioaddr) dummy_packet[12] = 0x00; dummy_packet[13] = 0x04; + memset(dummy_packet + 14, 0, sizeof(dummy_packet) - 14); eth16i_select_regbank(2, ioaddr); |