diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2015-08-16 14:06:07 +0200 |
|---|---|---|
| committer | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2015-08-16 14:06:07 +0200 |
| commit | 763602962f31c587138c0edda7364807b3321bba (patch) | |
| tree | 84167cb01577788710a59482d376a59fc3183e3a /drivers/net/wireless/iwlwifi/mvm/mac80211.c | |
| parent | 0917f823c59692d751951bf5ea699a2d1e2f26a2 (diff) | |
| parent | 352cb8677f83a6cf2139151578c8c79785d2d4bf (diff) | |
Merge tag 'v4.1.5' into linux-4.1.y-rt
This is the 4.1.5 stable release
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mac80211.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mac80211.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c index dda9f7b5f342..60c138a9bf4f 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c @@ -1404,7 +1404,7 @@ void __iwl_mvm_mac_stop(struct iwl_mvm *mvm) * The work item could be running or queued if the * ROC time event stops just as we get here. */ - cancel_work_sync(&mvm->roc_done_wk); + flush_work(&mvm->roc_done_wk); iwl_trans_stop_device(mvm->trans); |