From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mga11.intel.com ([192.55.52.93]:53494 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753517AbYLSCpo (ORCPT ); Thu, 18 Dec 2008 21:45:44 -0500 From: Zhu Yi To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, ipw3945-devel@lists.sourceforge.net, "Kolekar, Abhijeet" , Zhu Yi Subject: [PATCH 41/43] iwl3945: release resources before shutting down Date: Fri, 19 Dec 2008 10:37:41 +0800 Message-Id: <1229654263-21454-42-git-send-email-yi.zhu@intel.com> (sfid-20081219_034636_586676_4882EEEA) In-Reply-To: <1229654263-21454-41-git-send-email-yi.zhu@intel.com> References: <1229654263-21454-1-git-send-email-yi.zhu@intel.com> <1229654263-21454-2-git-send-email-yi.zhu@intel.com> <1229654263-21454-3-git-send-email-yi.zhu@intel.com> <1229654263-21454-4-git-send-email-yi.zhu@intel.com> <1229654263-21454-5-git-send-email-yi.zhu@intel.com> <1229654263-21454-6-git-send-email-yi.zhu@intel.com> <1229654263-21454-7-git-send-email-yi.zhu@intel.com> <1229654263-21454-8-git-send-email-yi.zhu@intel.com> <1229654263-21454-9-git-send-email-yi.zhu@intel.com> <1229654263-21454-10-git-send-email-yi.zhu@intel.com> <1229654263-21454-11-git-send-email-yi.zhu@intel.com> <1229654263-21454-12-git-send-email-yi.zhu@intel.com> <1229654263-21454-13-git-send-email-yi.zhu@intel.com> <1229654263-21454-14-git-send-email-yi.zhu@intel.com> <1229654263-21454-15-git-send-email-yi.zhu@intel.com> <1229654263-21454-16-git-send-email-yi.zhu@intel.com> <1229654263-21454-17-git-send-email-yi.zhu@intel.com> <1229654263-21454-18-git-send-email-yi.zhu@intel.com> <1229654263-21454-19-git-send-email-yi.zhu@intel.com> <1229654263-21454-20-git-send-email-yi.zhu@intel.com> <1229654263-21454-21-git-send-email-yi.zhu@intel.com> <1229654263-21454-22-git-send-email-yi.zhu@intel.com> <1229654263-21454-23-git-send-email-yi.zhu@intel.com> <1229654263-21454-24-git-send-email-yi.zhu@intel.com> <1229654263-21454-25-git-send-email-yi.zhu@intel.com> <1229654263-21454-26-git-send-email-yi.zhu@intel.com> <1229654263-21454-27-git-send-email-yi.zhu@intel.com> <1229654263-21454-28-git-send-email-yi.zhu@intel.com> <1229654263-21454-29-git-send-email-yi.zhu@intel.com> <1229654263-21454-30-git-send-email-yi.zhu@intel.com> <1229654263-21454-31-git-send-email-yi.zhu@intel.com> <1229654263-21454-32-git-send-email-yi.zhu@intel.com> <1229654263-21454-33-git-send-email-yi.zhu@intel.com> <1229654263-21454-34-git-send-email-yi.zhu@intel.com> <1229654263-21454-35-git-send-email-yi.zhu@intel.com> <1229654263-21454-36-git-send-email-yi.zhu@intel.com> <1229654263-21454-37-git-send-email-yi.zhu@intel.com> <1229654263-21454-38-git-send-email-yi.zhu@intel.com> <1229654263-21454-39-git-send-email-yi.zhu@intel.com> <1229654263-21454-40-git-send-email-yi.zhu@intel.com> <1229654263-21454-41-git-send-email-yi.zhu@intel.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: From: Kolekar, Abhijeet Release resource before shutting down and notify upper stack. Signed-off-by: Abhijeet Kolekar Signed-off-by: Zhu Yi --- drivers/net/wireless/iwlwifi/iwl3945-base.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 1d4a474..3305fa9 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -7740,7 +7740,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 @@ -7763,9 +7768,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); -- 1.5.3.6