diff options
| author | Zhu Yi <yi.zhu@intel.com> | 2009-10-15 14:50:28 +0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-10-30 15:50:24 -0400 |
| commit | e6c5fc53d0f44a772398402ee8a1879818e42b4e (patch) | |
| tree | 440f91d018016246c118d0165641e8332f648d65 /drivers/net/wireless/ipw2x00/ipw2100.c | |
| parent | 63ca2d74ea4f9c7a7ac082c915609a7b224908e7 (diff) | |
| download | kernel_samsung_smdk4412-e6c5fc53d0f44a772398402ee8a1879818e42b4e.zip kernel_samsung_smdk4412-e6c5fc53d0f44a772398402ee8a1879818e42b4e.tar.gz kernel_samsung_smdk4412-e6c5fc53d0f44a772398402ee8a1879818e42b4e.tar.bz2 | |
ipw2200: fix oops on missing firmware
For non-monitor interfaces, the syntax for alloc_ieee80211/free_80211
is wrong. Because alloc_ieee80211 only creates (wiphy_new) a wiphy, but
free_80211() does wiphy_unregister() also. This is only correct when
the later wiphy_register() is called successfully, which apparently
is not the case for your fw doesn't exist one.
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ipw2x00/ipw2100.c')
| -rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2100.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c index 240cff1..a741d37 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c @@ -6325,8 +6325,10 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev, fail: if (dev) { - if (registered) + if (registered) { + unregister_ieee80211(priv->ieee); unregister_netdev(dev); + } ipw2100_hw_stop_adapter(priv); @@ -6383,6 +6385,7 @@ static void __devexit ipw2100_pci_remove_one(struct pci_dev *pci_dev) /* Unregister the device first - this results in close() * being called if the device is open. If we free storage * first, then close() will crash. */ + unregister_ieee80211(priv->ieee); unregister_netdev(dev); /* ipw2100_down will ensure that there is no more pending work |