Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (82 commits)
  ipw2200: Call netif_*_queue() interfaces properly.
  netxen: Needs to include linux/vmalloc.h
  [netdrvr] atl1d: fix !CONFIG_PM build
  r6040: rework init_one error handling
  r6040: bump release number to 0.18
  r6040: handle RX fifo full and no descriptor interrupts
  r6040: change the default waiting time
  r6040: use definitions for magic values in descriptor status
  r6040: completely rework the RX path
  r6040: call napi_disable when puting down the interface and set lp->dev accordingly.
  mv643xx_eth: fix NETPOLL build
  r6040: rework the RX buffers allocation routine
  r6040: fix scheduling while atomic in r6040_tx_timeout
  r6040: fix null pointer access and tx timeouts
  r6040: prefix all functions with r6040
  rndis_host: support WM6 devices as modems
  at91_ether: use netstats in net_device structure
  sfc: Create one RX queue and interrupt per CPU package by default
  sfc: Use a separate workqueue for resets
  sfc: I2C adapter initialisation fixes
  ...

1 files changed, 12 insertions, 6 deletions

diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 913dc9fe08f9..5816230d58f8 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -364,8 +364,7 @@ static void mac80211_hwsim_free(void)
                         struct mac80211_hwsim_data *data;
                         data = hwsim_radios[i]->priv;
                         ieee80211_unregister_hw(hwsim_radios[i]);
-                        if (!IS_ERR(data->dev))
-                                device_unregister(data->dev);
+                        device_unregister(data->dev);
                         ieee80211_free_hw(hwsim_radios[i]);
                 }
         }
@@ -437,7 +436,7 @@ static int __init init_mac80211_hwsim(void)
                                "mac80211_hwsim: device_create_drvdata "
                                "failed (%ld)\n", PTR_ERR(data->dev));
                         err = -ENOMEM;
-                        goto failed;
+                        goto failed_drvdata;
                 }
                 data->dev->driver = &mac80211_hwsim_driver;
 
@@ -461,7 +460,7 @@ static int __init init_mac80211_hwsim(void)
                 if (err < 0) {
                         printk(KERN_DEBUG "mac80211_hwsim: "
                                "ieee80211_register_hw failed (%d)\n", err);
-                        goto failed;
+                        goto failed_hw;
                 }
 
                 printk(KERN_DEBUG "%s: hwaddr %s registered\n",
@@ -479,9 +478,9 @@ static int __init init_mac80211_hwsim(void)
         rtnl_lock();
 
         err = dev_alloc_name(hwsim_mon, hwsim_mon->name);
-        if (err < 0) {
+        if (err < 0)
                 goto failed_mon;
-        }
+
 
         err = register_netdevice(hwsim_mon);
         if (err < 0)
@@ -494,7 +493,14 @@ static int __init init_mac80211_hwsim(void)
 failed_mon:
         rtnl_unlock();
         free_netdev(hwsim_mon);
+        mac80211_hwsim_free();
+        return err;
 
+failed_hw:
+        device_unregister(data->dev);
+failed_drvdata:
+        ieee80211_free_hw(hw);
+        hwsim_radios[i] = 0;
 failed:
         mac80211_hwsim_free();
         return err;