diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-03 06:18:50 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-03 06:18:50 +0300 |
| commit | bcfe3c2046fc4f16544f2b127f1b159dd1fcad8b (patch) | |
| tree | d1a13eedc08cdc07aa488e77af08b84c50a07c46 /drivers/net/wireless/ipw2x00/ipw2100.c | |
| parent | 2e9526b352061ee0fd2a1580a2e3a5af960dabc4 (diff) | |
| parent | c1f9a764cf47686b1f5a0cf87ada68d90056136a (diff) | |
| download | linux-bcfe3c2046fc4f16544f2b127f1b159dd1fcad8b.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
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 240cff1e6979..a741d37fd96f 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 |