diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-04-25 13:41:25 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-04-25 13:41:25 -0400 |
commit | 395836282f7cf8b1dac9b9c2aa2bacddfa1580b5 (patch) | |
tree | 5b1585dbe4f9525d54d5256875a8f038a78d0c05 /drivers/net/wireless/rtlwifi/pci.c | |
parent | 2a5809499e35b53a6044fd34e72b242688b7a862 (diff) | |
parent | afa762f6871a8cb05fbef5d0f83fac14304aa816 (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/rtlwifi/pci.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c index 288b035a357..cc15fdb3606 100644 --- a/drivers/net/wireless/rtlwifi/pci.c +++ b/drivers/net/wireless/rtlwifi/pci.c @@ -1941,6 +1941,7 @@ void rtl_pci_disconnect(struct pci_dev *pdev) rtl_deinit_deferred_work(hw); rtlpriv->intf_ops->adapter_stop(hw); } + rtlpriv->cfg->ops->disable_interrupt(hw); /*deinit rfkill */ rtl_deinit_rfkill(hw); |