diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-11-21 10:26:17 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-11-21 10:26:17 -0500 |
commit | 7acd71879ce408af2d2ca3cd3ec3a86d0667ceae (patch) | |
tree | 8332fdffc7980575268f902c1cffe37ee2587a4d /drivers/net/wireless/mwifiex/pcie.c | |
parent | 68c6beb373955da0886d8f4f5995b3922ceda4be (diff) | |
parent | 3b1bace9960b0acbcb5d0ca194077f03df7cc2c0 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/mwifiex/pcie.c')
-rw-r--r-- | drivers/net/wireless/mwifiex/pcie.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c index 33fa9432b241..03688aa14e8a 100644 --- a/drivers/net/wireless/mwifiex/pcie.c +++ b/drivers/net/wireless/mwifiex/pcie.c @@ -232,7 +232,6 @@ static void mwifiex_pcie_remove(struct pci_dev *pdev) } mwifiex_remove_card(card->adapter, &add_remove_card_sem); - kfree(card); } static void mwifiex_pcie_shutdown(struct pci_dev *pdev) @@ -2313,6 +2312,7 @@ static void mwifiex_pcie_cleanup(struct mwifiex_adapter *adapter) pci_release_region(pdev, 0); pci_set_drvdata(pdev, NULL); } + kfree(card); } /* |