diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2012-03-31 11:28:38 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-04-23 17:19:47 -0400 |
commit | 218733cf7d01fb6225e37a16818870d20c1d8771 (patch) | |
tree | f5b2afb03ced78868a9cad0599a1fb6b0aa4f8bd /drivers/net/wireless/iwlwifi/iwl-agn.c | |
parent | d23f78e61f6b37159df6bfce7023500d731f61f3 (diff) |
iwlwifi: provide proper API to disable all interrupts
Since the op_mode may go away, the transport needs to be able to
be told not to update the op_mode at all (even for RF kill).
Provide this API and use it in the proper places.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 07df4326cdec..3024d8cc7aa3 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -1633,7 +1633,7 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, | |||
1633 | goto out_free_traffic_mem; | 1633 | goto out_free_traffic_mem; |
1634 | } | 1634 | } |
1635 | /* Reset chip to save power until we load uCode during "up". */ | 1635 | /* Reset chip to save power until we load uCode during "up". */ |
1636 | iwl_trans_stop_hw(priv->trans); | 1636 | iwl_trans_stop_hw(priv->trans, false); |
1637 | 1637 | ||
1638 | if (iwl_eeprom_check_version(priv)) | 1638 | if (iwl_eeprom_check_version(priv)) |
1639 | goto out_free_eeprom; | 1639 | goto out_free_eeprom; |
@@ -1786,6 +1786,7 @@ void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode) | |||
1786 | 1786 | ||
1787 | dev_kfree_skb(priv->beacon_skb); | 1787 | dev_kfree_skb(priv->beacon_skb); |
1788 | 1788 | ||
1789 | iwl_trans_stop_hw(priv->trans, true); | ||
1789 | ieee80211_free_hw(priv->hw); | 1790 | ieee80211_free_hw(priv->hw); |
1790 | } | 1791 | } |
1791 | 1792 | ||