From: Luciano Coelho <coelho@ti.com>
To: linux-wireless@vger.kernel.org
Cc: coelho@ti.com
Subject: [PATCH 4/8] wl12xx: cancel delayed elp work and clear flags when stopping PLT
Date: Tue, 24 Jan 2012 11:06:25 +0200 [thread overview]
Message-ID: <1327395989-29663-5-git-send-email-coelho@ti.com> (raw)
In-Reply-To: <1327395989-29663-1-git-send-email-coelho@ti.com>
In some cases a race condition can happen if we don't cancel any
pending ELP work before stopping PLT. With this commit we cancel ELP
work and clear the wl->flags bitmask. Also clean up the wl elements
after powering off.
Signed-off-by: Luciano Coelho <coelho@ti.com>
---
drivers/net/wireless/wl12xx/main.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 27ca324..6ec22b3 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -1420,17 +1420,18 @@ int wl1271_plt_stop(struct wl1271 *wl)
goto out;
}
- wl->state = WL1271_STATE_OFF;
- wl->rx_counter = 0;
-
mutex_unlock(&wl->mutex);
wl1271_flush_deferred_work(wl);
cancel_work_sync(&wl->netstack_work);
cancel_work_sync(&wl->recovery_work);
+ cancel_delayed_work_sync(&wl->elp_work);
mutex_lock(&wl->mutex);
wl1271_power_off(wl);
+ wl->flags = 0;
+ wl->state = WL1271_STATE_OFF;
+ wl->rx_counter = 0;
mutex_unlock(&wl->mutex);
out:
--
1.7.4.1
next prev parent reply other threads:[~2012-01-24 9:06 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-24 9:06 [PATCH 0/8] wl12xx: some fixes and improvements for PLT mode Luciano Coelho
2012-01-24 9:06 ` [PATCH 1/8] wl12xx: Acquire lock before stopping plt Luciano Coelho
2012-01-24 9:06 ` [PATCH 2/8] wl12xx: Power off after flushing work Luciano Coelho
2012-01-24 9:06 ` [PATCH 3/8] wl12xx: Fix potential interrupt storm Luciano Coelho
2012-01-24 9:06 ` Luciano Coelho [this message]
2012-01-24 9:06 ` [PATCH 5/8] wl12xx: move partition table definition to io.c Luciano Coelho
2012-01-24 9:06 ` [PATCH 6/8] wl12xx: read chip ID and HW PG version during probe Luciano Coelho
2012-01-24 9:06 ` [PATCH 7/8] wl12xx: use two MAC addresses based on the NVS or from fuse ROM Luciano Coelho
2012-01-24 9:06 ` [PATCH 8/8] wl12xx: add testmode operation to read the BD_ADDR from Fuse ROM Luciano Coelho
2012-02-15 10:12 ` [PATCH 0/8] wl12xx: some fixes and improvements for PLT mode Luciano Coelho
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1327395989-29663-5-git-send-email-coelho@ti.com \
--to=coelho@ti.com \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox