From 2a93c13a65a8ade2cd4f627dc84c440522d9942a Mon Sep 17 00:00:00 2001 From: Grazvydas Ignotas Date: Thu, 26 Apr 2012 23:07:44 +0300 Subject: [PATCH] --- yaml --- r: 299994 b: refs/heads/master c: 4c1bcdb5a3354b250b82a67549f57ac27a3bb85f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl1251/main.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7cd923f464ee..ebfd7a325dee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 328c32f0f85467af5a6c4c3289e168d9ad2555af +refs/heads/master: 4c1bcdb5a3354b250b82a67549f57ac27a3bb85f diff --git a/trunk/drivers/net/wireless/wl1251/main.c b/trunk/drivers/net/wireless/wl1251/main.c index 41302c7b1ad0..d1afb8e3b2ef 100644 --- a/trunk/drivers/net/wireless/wl1251/main.c +++ b/trunk/drivers/net/wireless/wl1251/main.c @@ -479,6 +479,7 @@ static void wl1251_op_stop(struct ieee80211_hw *hw) cancel_work_sync(&wl->irq_work); cancel_work_sync(&wl->tx_work); cancel_work_sync(&wl->filter_work); + cancel_delayed_work_sync(&wl->elp_work); mutex_lock(&wl->mutex);