diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-05-10 02:32:01 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-05-10 02:32:01 +0200 |
| commit | 3aa450c063e29b4f4b622480e1779e5e256d8f8f (patch) | |
| tree | d18942ff8bf862f2973f4e7adbf99c4f3e22a563 /drivers/net/wireless/wl1251/main.c | |
| parent | spi/devicetree: Move devicetree support code into spi directory (diff) | |
| parent | Linux 3.4-rc6 (diff) | |
| download | linux-3aa450c063e29b4f4b622480e1779e5e256d8f8f.tar.xz linux-3aa450c063e29b4f4b622480e1779e5e256d8f8f.zip | |
Merge tag 'v3.4-rc6' into spi/next
Linux 3.4-rc6
Diffstat (limited to 'drivers/net/wireless/wl1251/main.c')
| -rw-r--r-- | drivers/net/wireless/wl1251/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl1251/main.c b/drivers/net/wireless/wl1251/main.c index 41302c7b1ad0..d1afb8e3b2ef 100644 --- a/drivers/net/wireless/wl1251/main.c +++ b/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); |