summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEyal Shapira <eyal@wizery.com>2012-06-26 10:41:17 +0300
committerLuciano Coelho <coelho@ti.com>2012-06-26 20:33:42 +0300
commit680c6055b9bebdf07fc2d5ebe816a14c7daecdc1 (patch)
tree03f4bf230c2f7bf86aee28a5c26fd7a7cba63572
parent6c15c1aae206dc275a948a5e50f965c2382c6866 (diff)
downloadblackbird-op-linux-680c6055b9bebdf07fc2d5ebe816a14c7daecdc1.tar.gz
blackbird-op-linux-680c6055b9bebdf07fc2d5ebe816a14c7daecdc1.zip
wlcore: print stack trace in every recovery
As recovery queuing can now occur from multiple code paths it's convenient to know what triggered it in all cases other than an intended recovery which is part of the switch between single role to multi role. Signed-off-by: Eyal Shapira <eyal@wizery.com> Signed-off-by: Luciano Coelho <coelho@ti.com>
-rw-r--r--drivers/net/wireless/ti/wlcore/cmd.c1
-rw-r--r--drivers/net/wireless/ti/wlcore/main.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ti/wlcore/cmd.c b/drivers/net/wireless/ti/wlcore/cmd.c
index ef139383ee93..56c7a2342fdf 100644
--- a/drivers/net/wireless/ti/wlcore/cmd.c
+++ b/drivers/net/wireless/ti/wlcore/cmd.c
@@ -124,7 +124,6 @@ int wl1271_cmd_send(struct wl1271 *wl, u16 id, void *buf, size_t len,
return 0;
fail:
- WARN_ON(1);
wl12xx_queue_recovery_work(wl);
return ret;
}
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index c5a9ffe6cc91..2240cca597ac 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -772,6 +772,8 @@ out:
void wl12xx_queue_recovery_work(struct wl1271 *wl)
{
+ WARN_ON(!test_bit(WL1271_FLAG_INTENDED_FW_RECOVERY, &wl->flags));
+
/* Avoid a recursive recovery */
if (!test_and_set_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags)) {
wlcore_disable_interrupts_nosync(wl);
OpenPOWER on IntegriCloud