From 9de7c9ad5a89221ea32672fe1f92cbe80aa6387a Mon Sep 17 00:00:00 2001 From: Nishant Sarmukadam Date: Tue, 8 Jan 2013 10:16:05 +0530 Subject: [PATCH] --- yaml --- r: 351857 b: refs/heads/master c: 9b0b11fb1e286e03ce911b94844952edd05f554e h: refs/heads/master i: 351855: 35fb3a77c0bd08e8d09e8ab314bbac5605045699 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/mwl8k.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b6afd44c2bf7..e4f176941c6d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96da6fdd5ae28568be63ccf1f70b14a72135d493 +refs/heads/master: 9b0b11fb1e286e03ce911b94844952edd05f554e diff --git a/trunk/drivers/net/wireless/mwl8k.c b/trunk/drivers/net/wireless/mwl8k.c index c4d287b48e64..04442c6290a6 100644 --- a/trunk/drivers/net/wireless/mwl8k.c +++ b/trunk/drivers/net/wireless/mwl8k.c @@ -1588,6 +1588,7 @@ static int mwl8k_tx_wait_empty(struct ieee80211_hw *hw) rc = -ETIMEDOUT; } + priv->tx_wait = NULL; spin_unlock_bh(&priv->tx_lock); return rc;