From 70ffd1003ef4c14b8bac9b9d7c6e0969859d1029 Mon Sep 17 00:00:00 2001 From: "Kolekar, Abhijeet" Date: Fri, 19 Dec 2008 10:37:41 +0800 Subject: [PATCH] --- yaml --- r: 134031 b: refs/heads/master c: d552bfb65241a35d48e44ddb0d27e0454f579ab4 h: refs/heads/master i: 134029: 56d07c8d60edca25839b1f04ca2ddf031369bdbf 134027: def31f96f528a1777844f2422f1a735d430d0a60 134023: 4c79090639c6339bcf6ec403af838edee10b3b8a 134015: 16e9a0064fe0e41537b03c0600d2212c56e2b345 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ec33b9f3f4b1..18667fa0cbe2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 90a30a021eec15da64a354656cb66987216361eb +refs/heads/master: d552bfb65241a35d48e44ddb0d27e0454f579ab4 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c index b84509763ac7..17f01a692870 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -7722,7 +7722,12 @@ static void __devexit iwl3945_pci_remove(struct pci_dev *pdev) set_bit(STATUS_EXIT_PENDING, &priv->status); - iwl3945_down(priv); + if (priv->mac80211_registered) { + ieee80211_unregister_hw(priv->hw); + priv->mac80211_registered = 0; + } else { + iwl3945_down(priv); + } /* make sure we flush any pending irq or * tasklet for the driver @@ -7745,9 +7750,6 @@ static void __devexit iwl3945_pci_remove(struct pci_dev *pdev) iwl3945_unset_hw_params(priv); iwl3945_clear_stations_table(priv); - if (priv->mac80211_registered) - ieee80211_unregister_hw(priv->hw); - /*netif_stop_queue(dev); */ flush_workqueue(priv->workqueue);