diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-04-25 14:34:25 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-04-25 14:34:25 -0400 |
| commit | cfef6047c4027a8448ec8dafeaf2bb362cc882e4 (patch) | |
| tree | c254bd25aa8b4b0696b5b5cc45d8e30c7c1bb9dd /drivers/net/wireless/rtlwifi/pci.c | |
| parent | b71d1d426d263b0b6cb5760322efebbfc89d4463 (diff) | |
| parent | 73b48099cc265f88fa1255f3f43e52fe6a94fd5c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/rt2x00/rt2x00queue.c
drivers/net/wireless/rt2x00/rt2x00queue.h
Diffstat (limited to 'drivers/net/wireless/rtlwifi/pci.c')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c index fbde52d8342..c3dd4cc678b 100644 --- a/drivers/net/wireless/rtlwifi/pci.c +++ b/drivers/net/wireless/rtlwifi/pci.c | |||
| @@ -1785,7 +1785,8 @@ void rtl_pci_disconnect(struct pci_dev *pdev) | |||
| 1785 | 1785 | ||
| 1786 | rtl_pci_deinit(hw); | 1786 | rtl_pci_deinit(hw); |
| 1787 | rtl_deinit_core(hw); | 1787 | rtl_deinit_core(hw); |
| 1788 | rtlpriv->cfg->ops->deinit_sw_leds(hw); | 1788 | if (rtlpriv->cfg->ops->deinit_sw_leds) |
| 1789 | rtlpriv->cfg->ops->deinit_sw_leds(hw); | ||
| 1789 | _rtl_pci_io_handler_release(hw); | 1790 | _rtl_pci_io_handler_release(hw); |
| 1790 | rtlpriv->cfg->ops->deinit_sw_vars(hw); | 1791 | rtlpriv->cfg->ops->deinit_sw_vars(hw); |
| 1791 | 1792 | ||