Merge "icnss: Do not clear SHUTDOWN_DONE flag until reinit is done" (e063ae69) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/soc/qcom/icnss.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}