summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSameer Thalappil <sameert@codeaurora.org>2017-10-30 11:17:01 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-10-31 10:19:55 -0700
commit9fccd743a2e685bb0730af9188d3636f53504c5c (patch)
tree509da94cd7c3e5f8d7b59d4459fd3a277cf26e21
parent9c23726ad4dfc95009710805647555503635ba2d (diff)
icnss: Do not assert if reboot requested during PDR
When icnss driver sees a PD down, and if the recovery is already in progress, it forces an assert in debug builds. That is to detect any Modem failures during PDR or to catch any instance of recursive PDRs. When system goes thru a reboot or shutdown, and if the recovery is in progress then avoid calling this assert. CRs-Fixed: 2135071 Change-Id: I28f5c79a4cd8b83f60a62111535b11c2fba6000b Signed-off-by: Sameer Thalappil <sameert@codeaurora.org>
-rw-r--r--drivers/soc/qcom/icnss.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/soc/qcom/icnss.c b/drivers/soc/qcom/icnss.c
index e9a097151141..3afe10141ac7 100644
--- a/drivers/soc/qcom/icnss.c
+++ b/drivers/soc/qcom/icnss.c
@@ -2347,7 +2347,7 @@ static int icnss_driver_event_pd_service_down(struct icnss_priv *priv,
if (!test_bit(ICNSS_WLFW_EXISTS, &priv->state))
goto out;
- if (test_bit(ICNSS_PD_RESTART, &priv->state)) {
+ if (test_bit(ICNSS_PD_RESTART, &priv->state) && event_data->crashed) {
icnss_pr_err("PD Down while recovery inprogress, crashed: %d, state: 0x%lx\n",
event_data->crashed, priv->state);
ICNSS_ASSERT(0);