lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[netdrvr] Fix register_netdev() races in older ISA net drivers

Browse Source
This commit is contained in:
2005-05-12 20:11:55 -04:00
committed by Jeff Garzik
parent 88d7bd8cb9
commit b1fc5505e0
21 changed files with 156 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/net/hp.c
View File

@@ -123,12 +123,7 @@ struct net_device * __init hp_probe(int unit)
err = do_hp_probe(dev);
if (err)
goto out;
err = register_netdev(dev);
if (err)
goto out1;
return dev;
out1:
cleanup_card(dev);
out:
free_netdev(dev);
return ERR_PTR(err);
@@ -227,7 +222,12 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr)
ei_status.block_output = &hp_block_output;
hp_init_card(dev);
retval = register_netdev(dev);
if (retval)
goto out1;
return 0;
out1:
free_irq(dev->irq, dev);
out:
release_region(ioaddr, HP_IO_EXTENT);
return retval;
@@ -432,11 +432,8 @@ init_module(void)
dev->irq = irq[this_dev];
dev->base_addr = io[this_dev];
if (do_hp_probe(dev) == 0) {
if (register_netdev(dev) == 0) {
dev_hp[found++] = dev;
continue;
}
cleanup_card(dev);
dev_hp[found++] = dev;
continue;
}
free_netdev(dev);
printk(KERN_WARNING "hp.c: No HP card found (i/o = 0x%x).\n", io[this_dev]);