Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next

2 files changed, 31 insertions, 37 deletions

diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index c72136c0777..9cfae0c0870 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -1963,10 +1963,8 @@ static int ipw2100_wdev_init(struct net_device *dev)
         wdev->wiphy->n_cipher_suites = ARRAY_SIZE(ipw_cipher_suites);
 
         set_wiphy_dev(wdev->wiphy, &priv->pci_dev->dev);
-        if (wiphy_register(wdev->wiphy)) {
-                ipw2100_down(priv);
+        if (wiphy_register(wdev->wiphy))
                 return -EIO;
-        }
         return 0;
 }
 
@@ -6331,6 +6329,11 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
         printk(KERN_INFO DRV_NAME
                ": Detected Intel PRO/Wireless 2100 Network Connection\n");
 
+        err = ipw2100_wdev_init(dev);
+        if (err)
+                goto fail;
+        registered = 1;
+
         /* Bring up the interface.  Pre 0.46, after we registered the
          * network device we would call ipw2100_up.  This introduced a race
          * condition with newer hotplug configurations (network was coming
@@ -6347,11 +6350,7 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
                        "Error calling register_netdev.\n");
                 goto fail;
         }
-        registered = 1;
-
-        err = ipw2100_wdev_init(dev);
-        if (err)
-                goto fail;
+        registered = 2;
 
         mutex_lock(&priv->action_mutex);
 
@@ -6390,13 +6389,16 @@ out:
 
       fail_unlock:
         mutex_unlock(&priv->action_mutex);
-        wiphy_unregister(priv->ieee->wdev.wiphy);
-        kfree(priv->ieee->bg_band.channels);
       fail:
         if (dev) {
-                if (registered)
+                if (registered >= 2)
                         unregister_netdev(dev);
 
+                if (registered) {
+                        wiphy_unregister(priv->ieee->wdev.wiphy);
+                        kfree(priv->ieee->bg_band.channels);
+                }
+
                 ipw2100_hw_stop_adapter(priv);
 
                 ipw2100_disable_interrupts(priv);
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index b3707dadad1..0036737fe8e 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -11443,20 +11443,6 @@ static void ipw_bg_down(struct work_struct *work)
         mutex_unlock(&priv->mutex);
 }
 
-/* Called by register_netdev() */
-static int ipw_net_init(struct net_device *dev)
-{
-        int rc = 0;
-        struct ipw_priv *priv = libipw_priv(dev);
-
-        mutex_lock(&priv->mutex);
-        if (ipw_up(priv))
-                rc = -EIO;
-        mutex_unlock(&priv->mutex);
-
-        return rc;
-}
-
 static int ipw_wdev_init(struct net_device *dev)
 {
         int i, rc = 0;
@@ -11725,7 +11711,6 @@ static void ipw_prom_free(struct ipw_priv *priv)
 #endif
 
 static const struct net_device_ops ipw_netdev_ops = {
-        .ndo_init               = ipw_net_init,
         .ndo_open               = ipw_net_open,
         .ndo_stop               = ipw_net_stop,
         .ndo_set_rx_mode        = ipw_net_set_multicast_list,
@@ -11848,17 +11833,24 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev,
                 goto out_release_irq;
         }
 
-        mutex_unlock(&priv->mutex);
-        err = register_netdev(net_dev);
-        if (err) {
-                IPW_ERROR("failed to register network device\n");
+        if (ipw_up(priv)) {
+                mutex_unlock(&priv->mutex);
+                err = -EIO;
                 goto out_remove_sysfs;
         }
 
+        mutex_unlock(&priv->mutex);
+
         err = ipw_wdev_init(net_dev);
         if (err) {
                 IPW_ERROR("failed to register wireless device\n");
-                goto out_unregister_netdev;
+                goto out_remove_sysfs;
+        }
+
+        err = register_netdev(net_dev);
+        if (err) {
+                IPW_ERROR("failed to register network device\n");
+                goto out_unregister_wiphy;
         }
 
 #ifdef CONFIG_IPW2200_PROMISCUOUS
@@ -11867,10 +11859,8 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev,
                 if (err) {
                         IPW_ERROR("Failed to register promiscuous network "
                                   "device (error %d).\n", err);
-                        wiphy_unregister(priv->ieee->wdev.wiphy);
-                        kfree(priv->ieee->a_band.channels);
-                        kfree(priv->ieee->bg_band.channels);
-                        goto out_unregister_netdev;
+                        unregister_netdev(priv->net_dev);
+                        goto out_unregister_wiphy;
                 }
         }
 #endif
@@ -11882,8 +11872,10 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev,
 
         return 0;
 
-      out_unregister_netdev:
-        unregister_netdev(priv->net_dev);
+      out_unregister_wiphy:
+        wiphy_unregister(priv->ieee->wdev.wiphy);
+        kfree(priv->ieee->a_band.channels);
+        kfree(priv->ieee->bg_band.channels);
       out_remove_sysfs:
         sysfs_remove_group(&pdev->dev.kobj, &ipw_attribute_group);
       out_release_irq: