diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-13 08:32:54 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-13 08:32:54 -0400 |
| commit | dc2af52c0d6d00fd530e4a5e300834cdb1bb1c1c (patch) | |
| tree | 4573b99fb11e5b93bd011045039b370ddafe45e6 /drivers/net/wireless/rtlwifi/pci.c | |
| parent | f1992dde7fef6713a469a5a142b86812b8a47f9e (diff) | |
| parent | 36be50515fe2aef61533b516fa2576a2c7fe7664 (diff) | |
Merge tag 'v3.4-rc7' into for-3.5
Linux 3.4-rc7
Conflicts):
drivers/base/regmap/regmap.c (overlap with bug fixes)
sound/soc/blackfin/bf5xx-ssm2602.c (overlap with bug fixes)
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 288b035a3579..cc15fdb36060 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) | |||
| 1941 | rtl_deinit_deferred_work(hw); | 1941 | rtl_deinit_deferred_work(hw); |
| 1942 | rtlpriv->intf_ops->adapter_stop(hw); | 1942 | rtlpriv->intf_ops->adapter_stop(hw); |
| 1943 | } | 1943 | } |
| 1944 | rtlpriv->cfg->ops->disable_interrupt(hw); | ||
| 1944 | 1945 | ||
| 1945 | /*deinit rfkill */ | 1946 | /*deinit rfkill */ |
| 1946 | rtl_deinit_rfkill(hw); | 1947 | rtl_deinit_rfkill(hw); |