diff --git a/[refs] b/[refs]
index 6354dd4846a9..29dc19a77f9f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0330ee1f5bb65bd2fd3c4b3980f4ba999405a153
+refs/heads/master: 4c145185175dcca660265d2fcdd4feffc0249f8e
diff --git a/trunk/drivers/net/wireless/ti/wlcore/tx.c b/trunk/drivers/net/wireless/ti/wlcore/tx.c
index c3607f09284b..b5b9bd6d4f06 100644
--- a/trunk/drivers/net/wireless/ti/wlcore/tx.c
+++ b/trunk/drivers/net/wireless/ti/wlcore/tx.c
@@ -1028,7 +1028,7 @@ void wl12xx_tx_reset(struct wl1271 *wl)
 	struct ieee80211_tx_info *info;
 
 	/* only reset the queues if something bad happened */
-	if (WARN_ON_ONCE(wl1271_tx_total_queue_count(wl) != 0)) {
+	if (wl1271_tx_total_queue_count(wl) != 0) {
 		for (i = 0; i < WL12XX_MAX_LINKS; i++)
 			wl1271_tx_reset_link_queues(wl, i);