From 9fccd743a2e685bb0730af9188d3636f53504c5c Mon Sep 17 00:00:00 2001 From: Sameer Thalappil Date: Mon, 30 Oct 2017 11:17:01 -0700 Subject: [PATCH] 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 --- drivers/soc/qcom/icnss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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);