diff options
| author | Eliad Peller | 2015-06-04 20:59:32 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach | 2015-08-04 09:11:47 +0200 |
| commit | c43fe907fec2c1925d423777ba14e0baf30c672c (patch) | |
| tree | 6796a5875fddaa5d450b9393416aea920db57fb8 /drivers/net/wireless/iwlwifi/mvm/d3.c | |
| parent | Revert "iwlwifi: mvm: move deferred d0i3 exit to resume_complete op" (diff) | |
| download | kernel-qcow2-linux-c43fe907fec2c1925d423777ba14e0baf30c672c.tar.gz kernel-qcow2-linux-c43fe907fec2c1925d423777ba14e0baf30c672c.tar.xz kernel-qcow2-linux-c43fe907fec2c1925d423777ba14e0baf30c672c.zip | |
iwlwifi: return error if d0i3 was aborted
Allow the transport layer to return an error upon suspend.
Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
Reviewed-by: Luciano Coelho <luciano.coelho@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/d3.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/d3.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/d3.c b/drivers/net/wireless/iwlwifi/mvm/d3.c index 246e60aa2905..68d721823645 100644 --- a/drivers/net/wireless/iwlwifi/mvm/d3.c +++ b/drivers/net/wireless/iwlwifi/mvm/d3.c @@ -1168,13 +1168,17 @@ remove_notif: int iwl_mvm_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan) { struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw); + int ret; + + ret = iwl_trans_suspend(mvm->trans); + if (ret) + return ret; - iwl_trans_suspend(mvm->trans); mvm->trans->wowlan_d0i3 = wowlan->any; if (mvm->trans->wowlan_d0i3) { /* 'any' trigger means d0i3 usage */ if (mvm->trans->d0i3_mode == IWL_D0I3_MODE_ON_SUSPEND) { - int ret = iwl_mvm_enter_d0i3_sync(mvm); + ret = iwl_mvm_enter_d0i3_sync(mvm); if (ret) return ret; |