| commit | d91ef6f6ef6dbe1f13f83db1025c3ae985bad4aa | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@quicinc.com> | Tue Dec 05 01:16:54 2017 -0800 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Tue Dec 05 01:16:54 2017 -0800 |
| tree | c8753225f2a10dde25e9bed0cc76a5c364b8f685 | |
| parent | 200a01e2f8751ab65c8f385a678c0bd99c591570 [diff] | |
| parent | 48a51e4e9e199ff4987530d16e979fb59da7d63f [diff] |
Merge "icnss: Reject driver reinit request when FW is down"
diff --git a/drivers/soc/qcom/icnss.c b/drivers/soc/qcom/icnss.c index 6f0c38d..e475041 100644 --- a/drivers/soc/qcom/icnss.c +++ b/drivers/soc/qcom/icnss.c
@@ -2156,6 +2156,12 @@ if (!priv->ops || !priv->ops->reinit) goto out; + if (test_bit(ICNSS_FW_DOWN, &priv->state)) { + icnss_pr_err("FW is in bad state, state: 0x%lx\n", + priv->state); + goto out; + } + if (!test_bit(ICNSS_DRIVER_PROBED, &priv->state)) goto call_probe;