Merge "icnss: Do not clear SHUTDOWN_DONE flag until reinit is done"
This commit is contained in:
commit
e063ae698c
1 changed files with 2 additions and 2 deletions
|
@ -1220,7 +1220,7 @@ static int icnss_call_driver_shutdown(struct icnss_priv *priv)
|
|||
|
||||
static int icnss_pd_restart_complete(struct icnss_priv *priv)
|
||||
{
|
||||
int ret;
|
||||
int ret = 0;
|
||||
|
||||
icnss_pm_relax(priv);
|
||||
|
||||
|
@ -1260,7 +1260,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, &penv->state);
|
||||
return 0;
|
||||
|
@ -1271,6 +1270,7 @@ static int icnss_pd_restart_complete(struct icnss_priv *priv)
|
|||
out_power_off:
|
||||
icnss_hw_power_off(priv);
|
||||
|
||||
out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue