Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "icnss: Do not clear SHUTDOWN_DONE flag until reinit is done"

Browse source
This commit is contained in:
qctecmdr 2020-08-05 00:53:53 -07:00 committed by Gerrit - the friendly Code Review server
commit e063ae698c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/soc/qcom/icnss.c
View file

@ -1220,7 +1220,7 @@ static int icnss_call_driver_shutdown(struct icnss_priv *priv)
static int icnss_pd_restart_complete(struct icnss_priv *priv) static int icnss_pd_restart_complete(struct icnss_priv *priv)
{ {
int ret; int ret = 0;
icnss_pm_relax(priv); icnss_pm_relax(priv);
@ -1260,7 +1260,6 @@ static int icnss_pd_restart_complete(struct icnss_priv *priv)
goto out_power_off; goto out_power_off;
} }
out:
icnss_block_shutdown(false); icnss_block_shutdown(false);
clear_bit(ICNSS_SHUTDOWN_DONE, &penv->state); clear_bit(ICNSS_SHUTDOWN_DONE, &penv->state);
return 0; return 0;
@ -1271,6 +1270,7 @@ static int icnss_pd_restart_complete(struct icnss_priv *priv)
out_power_off: out_power_off:
icnss_hw_power_off(priv); icnss_hw_power_off(priv);
out:
return ret; return ret;
} }