diff options
| author |   Luciano Coelho <luciano.coelho@intel.com> | 2013-11-19 22:53:41 +0200 |
|---|---|---|
| committer |   Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2013-12-09 22:29:45 +0200 |
| commit | b70ab7278f5e872dec600a6f16c6a8dba4601794 (patch) | |
| tree | 94fa386e3c2bc620e0924f0cdc360b2e76b6f152 /drivers/net/wireless/iwlwifi/mvm/d3.c | |
| parent | iwlwifi: mvm: add iwl_mvm_sta_from_mac80211 (diff) | |
| download | linux-dev-b70ab7278f5e872dec600a6f16c6a8dba4601794.tar.xz linux-dev-b70ab7278f5e872dec600a6f16c6a8dba4601794.zip | |
iwlwifi: mvm: don't restart HW if suspending fails before D3 image is loaded
If we haven't loaded the D3 image yet and a failure in the suspend
process occurs, we shouldn't restart the HW, because we're still
running the D0 image.
Signed-off-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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/d3.c b/drivers/net/wireless/iwlwifi/mvm/d3.c index b9e1f30e33de..665f87e788d6 100644 --- a/drivers/net/wireless/iwlwifi/mvm/d3.c +++ b/drivers/net/wireless/iwlwifi/mvm/d3.c @@ -1227,10 +1227,11 @@ static int __iwl_mvm_suspend(struct ieee80211_hw *hw, mvm->aux_sta.sta_id = old_aux_sta_id; mvm_ap_sta->sta_id = old_ap_sta_id; mvmvif->ap_sta_id = old_ap_sta_id; - out_noreset: - kfree(key_data.rsc_tsc); + if (ret < 0) ieee80211_restart_hw(mvm->hw); + out_noreset: + kfree(key_data.rsc_tsc); mutex_unlock(&mvm->mutex); |