From 23be331a40c66b44b577929b5e470b8978d7f36b Mon Sep 17 00:00:00 2001
From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date: Tue, 7 Feb 2012 14:27:31 +0200
Subject: [PATCH] --- yaml --- r: 290743 b: refs/heads/master c:
 07590f080d5f29e33158b22f7ad6079b85d87609 h: refs/heads/master i:   290741:
 3df5a7d78ee632ff4a6591b6fd8a6329fedf221f   290739:
 a3d5400de472242290ed3ddb41e80011475d25fe   290735:
 00f8231124d283dca5123b0871c38ed3d9931b4a v: v3

---
 [refs]                                       |  2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-drv.c |  7 +++++++
 trunk/drivers/net/wireless/iwlwifi/iwl-drv.h | 13 +++++++++++++
 trunk/drivers/net/wireless/iwlwifi/iwl-pci.c |  3 +--
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c582a5f88693..74c9eb8c4bbb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c58edc63edd6cd8097e2bee90e2d341e33bcd60
+refs/heads/master: 07590f080d5f29e33158b22f7ad6079b85d87609
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-drv.c b/trunk/drivers/net/wireless/iwlwifi/iwl-drv.c
index 49f7e70bc362..b3876dec52af 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -92,3 +92,10 @@ int iwl_drv_start(struct iwl_shared *shrd,
 	return ret;
 }
 
+void iwl_drv_stop(struct iwl_shared *shrd)
+{
+	iwl_remove(shrd->priv);
+
+	kfree(shrd->nic);
+}
+
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-drv.h b/trunk/drivers/net/wireless/iwlwifi/iwl-drv.h
index c40545199224..90534a23ddc8 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-drv.h
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-drv.h
@@ -107,4 +107,17 @@
 int iwl_drv_start(struct iwl_shared *shrd,
 		  struct iwl_trans *trans, struct iwl_cfg *cfg);
 
+/**
+ * iwl_drv_stop - stop the drv
+ *
+ * @shrd: the shrd area
+ *
+ * TODO: review the parameters given to this function
+ *
+ * Stop the driver. This should be called by bus specific system flows
+ * implementations. For example, the bus specific remove function should first
+ * call this function and then do the bus related operations only.
+ */
+void iwl_drv_stop(struct iwl_shared *shrd);
+
 #endif /* __iwl_drv_h__ */
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-pci.c b/trunk/drivers/net/wireless/iwlwifi/iwl-pci.c
index e2695445dfac..b9cdd1ac1744 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-pci.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-pci.c
@@ -321,12 +321,11 @@ static void __devexit iwl_pci_remove(struct pci_dev *pdev)
 	struct iwl_bus *bus = pci_get_drvdata(pdev);
 	struct iwl_shared *shrd = bus->shrd;
 
-	iwl_remove(shrd->priv);
+	iwl_drv_stop(shrd);
 	iwl_trans_free(shrd->trans);
 
 	pci_set_drvdata(pdev, NULL);
 
-	kfree(bus->shrd->nic);
 	kfree(bus->shrd);
 	kfree(bus);
 }