From 975755d49da528a524c08d95fd70e842f259319a Mon Sep 17 00:00:00 2001 From: Arik Nemtsov Date: Tue, 27 Nov 2012 08:44:53 +0200 Subject: [PATCH] --- yaml --- r: 352200 b: refs/heads/master c: d935e385f88616fa867406de97521e07fe41539d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ti/wlcore/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 29dc19a77f9f..ab34095538a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c145185175dcca660265d2fcdd4feffc0249f8e +refs/heads/master: d935e385f88616fa867406de97521e07fe41539d diff --git a/trunk/drivers/net/wireless/ti/wlcore/main.c b/trunk/drivers/net/wireless/ti/wlcore/main.c index 33392168bf39..63d3413d6002 100644 --- a/trunk/drivers/net/wireless/ti/wlcore/main.c +++ b/trunk/drivers/net/wireless/ti/wlcore/main.c @@ -1852,8 +1852,8 @@ static void wlcore_op_stop_locked(struct wl1271 *wl) cancel_delayed_work_sync(&wl->tx_watchdog_work); /* let's notify MAC80211 about the remaining pending TX frames */ - wl12xx_tx_reset(wl); mutex_lock(&wl->mutex); + wl12xx_tx_reset(wl); wl1271_power_off(wl); /*