summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-12-04 15:19:50 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-12-04 15:19:50 -0800
commit06b749683b138ebafaa120ff16d931abb528fbed (patch)
treeea30de84ace6c31bd0f9905a64456244deec2d2b
parentaae91909648cb29949eadf5773b72fe9771167fa (diff)
parent554899595c018f4075db6f3a3d0f0221ceaec053 (diff)
Merge "icnss: Reject register_driver request when WLAN FW is down"
-rw-r--r--drivers/soc/qcom/icnss.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/soc/qcom/icnss.c b/drivers/soc/qcom/icnss.c
index 73d6bea83b95..e7f83ed1307b 100644
--- a/drivers/soc/qcom/icnss.c
+++ b/drivers/soc/qcom/icnss.c
@@ -2246,6 +2246,12 @@ static int icnss_driver_event_register_driver(void *data)
if (test_bit(SKIP_QMI, &quirks))
set_bit(ICNSS_FW_READY, &penv->state);
+ if (test_bit(ICNSS_FW_DOWN, &penv->state)) {
+ icnss_pr_err("FW is in bad state, state: 0x%lx\n",
+ penv->state);
+ return -ENODEV;
+ }
+
if (!test_bit(ICNSS_FW_READY, &penv->state)) {
icnss_pr_dbg("FW is not ready yet, state: 0x%lx\n",
penv->state);