Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / net / wd.c

diff --git a/drivers/net/wd.c b/drivers/net/wd.c
index 1f05d9b..7caa8dc 100644 (file)
--- a/drivers/net/wd.c
+++ b/drivers/net/wd.c
@@ -127,13 +127,6 @@ static int __init do_wd_probe(struct net_device *dev)
        return -ENODEV;
 }
 
-static void cleanup_card(struct net_device *dev)
-{
-       free_irq(dev->irq, dev);
-       release_region(dev->base_addr - WD_NIC_OFFSET, WD_IO_EXTENT);
-       iounmap(ei_status.mem);
-}
-
 #ifndef MODULE
 struct net_device * __init wd_probe(int unit)
 {
@@ -149,12 +142,7 @@ struct net_device * __init wd_probe(int unit)
        err = do_wd_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);
@@ -164,6 +152,7 @@ out:
 static int __init wd_probe1(struct net_device *dev, int ioaddr)
 {
        int i;
+       int err;
        int checksum = 0;
        int ancient = 0;                        /* An old card without config registers. */
        int word16 = 0;                         /* 0 = 8 bit, 1 = 16 bit */
@@ -356,7 +345,10 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr)
                outb(inb(ioaddr+4)|0x80, ioaddr+4);
 #endif
 
-       return 0;
+       err = register_netdev(dev);
+       if (err)
+               free_irq(dev->irq, dev);
+       return err;
 }
 
 static int
@@ -527,11 +519,8 @@ init_module(void)
                dev->mem_start = mem[this_dev];
                dev->mem_end = mem_end[this_dev];
                if (do_wd_probe(dev) == 0) {
-                       if (register_netdev(dev) == 0) {
-                               dev_wd[found++] = dev;
-                               continue;
-                       }
-                       cleanup_card(dev);
+                       dev_wd[found++] = dev;
+                       continue;
                }
                free_netdev(dev);
                printk(KERN_WARNING "wd.c: No wd80x3 card found (i/o = 0x%x).\n", io[this_dev]);
@@ -542,6 +531,13 @@ init_module(void)
        return -ENXIO;
 }
 
+static void cleanup_card(struct net_device *dev)
+{
+       free_irq(dev->irq, dev);
+       release_region(dev->base_addr - WD_NIC_OFFSET, WD_IO_EXTENT);
+       iounmap(ei_status.mem);
+}
+
 void
 cleanup_module(void)
 {