From 07590f080d5f29e33158b22f7ad6079b85d87609 Mon Sep 17 00:00:00 2001 From: Emmanuel Grumbach Date: Tue, 7 Feb 2012 14:27:31 +0200 Subject: iwlwifi: drv object can release its own memory Move that code to the iwl-drv.c Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy --- drivers/net/wireless/iwlwifi/iwl-pci.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'drivers/net/wireless/iwlwifi/iwl-pci.c') diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/iwl-pci.c index e2695445dfac..b9cdd1ac1744 100644 --- a/drivers/net/wireless/iwlwifi/iwl-pci.c +++ b/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); } -- cgit v1.2.3