OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0c21298
)
wlcore: remove duplicate BUG_ON during recovery
author
Arik Nemtsov
<arik@wizery.com>
Tue, 15 May 2012 13:46:58 +0000
(16:46 +0300)
committer
Luciano Coelho
<coelho@ti.com>
Tue, 5 Jun 2012 17:24:31 +0000
(20:24 +0300)
This BUG_ON also ignored the INTENDED_FW_RECOVERY flag. This would
result in a BUG() when using the bug_on_recovery module parameter during
multi-role.
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
drivers/net/wireless/ti/wlcore/main.c
patch
|
blob
|
history
diff --git
a/drivers/net/wireless/ti/wlcore/main.c
b/drivers/net/wireless/ti/wlcore/main.c
index
b0607f6
..
414fde4
100644
(file)
--- a/
drivers/net/wireless/ti/wlcore/main.c
+++ b/
drivers/net/wireless/ti/wlcore/main.c
@@
-852,8
+852,6
@@
static void wl1271_recovery_work(struct work_struct *work)
goto out_unlock;
}
- BUG_ON(bug_on_recovery);
-
/*
* Advance security sequence number to overcome potential progress
* in the firmware during recovery. This doens't hurt if the network is