From f75af2ca539f32a250e04785a58da1c1c2b0d11e Mon Sep 17 00:00:00 2001 From: Naman Padhiar Date: Wed, 5 Aug 2020 00:55:40 +0530 Subject: [PATCH] icnss2: Do not clear SHUTDOWN_DONE flag until reinit is done In case of SSR/PDR, when FW comes up, platform driver receives FW_READY indication. As part of FW_READY, platform driver calls shutdown and reinit ops of host driver. Clear SHUTDOWN_DONE flag at right place so that if reinit is not called SSR/PDR because of FW again went down between calling driver shutdown and reinit then next time directly call reinit and avoid calling shutdown. Change-Id: Icdd259d52db1b84203a9efb2e5948207f3213ce6 Signed-off-by: Naman Padhiar --- drivers/soc/qcom/icnss2/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/soc/qcom/icnss2/main.c b/drivers/soc/qcom/icnss2/main.c index 005be440fa29..fd8a68d98f7c 100644 --- a/drivers/soc/qcom/icnss2/main.c +++ b/drivers/soc/qcom/icnss2/main.c @@ -716,7 +716,7 @@ out: static int icnss_pd_restart_complete(struct icnss_priv *priv) { - int ret; + int ret = 0; icnss_pm_relax(priv); @@ -756,7 +756,6 @@ static int icnss_pd_restart_complete(struct icnss_priv *priv) goto out_power_off; } -out: icnss_block_shutdown(false); clear_bit(ICNSS_SHUTDOWN_DONE, &priv->state); return 0; @@ -767,6 +766,7 @@ call_probe: out_power_off: icnss_hw_power_off(priv); +out: return ret; }