summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-03-01 18:38:28 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-03-01 18:38:27 -0800
commitfff128602348b2bebd69ceb552fd49c220272b72 (patch)
tree4c321d37b0907e35ba13ab691b28e21dec1ca2d4
parentec98470ea93ef170bf8651907d60d79b6727ddb5 (diff)
parent443b19badd471c1af09990c3d08cf8395070fc8b (diff)
Merge "icnss: Trigger recovery only if PDR enabled"
-rw-r--r--drivers/soc/qcom/icnss.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/soc/qcom/icnss.c b/drivers/soc/qcom/icnss.c
index 8562ada73c1d..4e541773c805 100644
--- a/drivers/soc/qcom/icnss.c
+++ b/drivers/soc/qcom/icnss.c
@@ -3136,6 +3136,13 @@ int icnss_trigger_recovery(struct device *dev)
goto out;
}
+ if (test_bit(ICNSS_PDR_ENABLED, &priv->state)) {
+ icnss_pr_err("PD restart not enabled: state: 0x%lx\n",
+ priv->state);
+ ret = -EOPNOTSUPP;
+ goto out;
+ }
+
if (!priv->service_notifier[0].handle) {
icnss_pr_err("Invalid handle during recovery, state: 0x%lx\n",
priv->state);