Merge with rsync://fileserver/linux

Update to 2.6.12-rc3

1 files changed, 8 insertions, 11 deletions

diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c
index 8f6b2fa13e28..9e1fe2e0478c 100644
--- a/drivers/net/3c523.c
+++ b/drivers/net/3c523.c
@@ -572,6 +572,10 @@ static int __init do_elmc_probe(struct net_device *dev)
         dev->flags&=~IFF_MULTICAST;     /* Multicast doesn't work */
 #endif
 
+        retval = register_netdev(dev);
+        if (retval)
+                goto err_out;
+
         return 0;
 err_out:
         mca_set_adapter_procfn(slot, NULL, NULL);
@@ -600,12 +604,7 @@ struct net_device * __init elmc_probe(int unit)
         err = do_elmc_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);
@@ -1275,6 +1274,7 @@ module_param_array(irq, int, NULL, 0);
 module_param_array(io, int, NULL, 0);
 MODULE_PARM_DESC(io, "EtherLink/MC I/O base address(es)");
 MODULE_PARM_DESC(irq, "EtherLink/MC IRQ number(s)");
+MODULE_LICENSE("GPL");
 
 int init_module(void)
 {
@@ -1288,12 +1288,9 @@ int init_module(void)
                 dev->irq=irq[this_dev];
                 dev->base_addr=io[this_dev];
                 if (do_elmc_probe(dev) == 0) {
-                        if (register_netdev(dev) == 0) {
-                                dev_elmc[this_dev] = dev;
-                                found++;
-                                continue;
-                        }
-                        cleanup_card(dev);
+                        dev_elmc[this_dev] = dev;
+                        found++;
+                        continue;
                 }
                 free_netdev(dev);
                 if (io[this_dev]==0)