From a2e0f9173ab58cb5513d73efd76d73481cf98e8d Mon Sep 17 00:00:00 2001 From: Eytan Lifshitz Date: Fri, 15 Feb 2013 16:31:45 +0200 Subject: [PATCH] --- yaml --- r: 352810 b: refs/heads/master c: 3104ba151eb9df1bc14878cfd2e4356bf537d18c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/dvm/tt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2e18fb19bcbc..c487e448a4b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec8b6885b543ceeb47fdb0c0e6981bb7420ab59e +refs/heads/master: 3104ba151eb9df1bc14878cfd2e4356bf537d18c diff --git a/trunk/drivers/net/wireless/iwlwifi/dvm/tt.c b/trunk/drivers/net/wireless/iwlwifi/dvm/tt.c index 67e2e1321b40..03f9bc01c0cc 100644 --- a/trunk/drivers/net/wireless/iwlwifi/dvm/tt.c +++ b/trunk/drivers/net/wireless/iwlwifi/dvm/tt.c @@ -471,8 +471,8 @@ static void iwl_advance_tt_handler(struct iwl_priv *priv, s32 temp, bool force) set_bit(STATUS_CT_KILL, &priv->status); iwl_perform_ct_kill_task(priv, true); } else { - iwl_prepare_ct_kill_task(priv); tt->state = old_state; + iwl_prepare_ct_kill_task(priv); } } else if (old_state == IWL_TI_CT_KILL && tt->state != IWL_TI_CT_KILL) {