Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 314af848 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "icnss: Check force error fatal before the early indication check"

parents c286c779 63544ad4

drivers/soc/qcom/icnss.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1103,6 +1103,9 @@ static int icnss_driver_event_pd_service_down(struct icnss_priv *priv, 
	if (!test_bit(ICNSS_WLFW_EXISTS, &priv->state))

	if (!test_bit(ICNSS_WLFW_EXISTS, &priv->state))

		goto out;

		goto out;





	if (priv->force_err_fatal)

		ICNSS_ASSERT(0);



	if (priv->early_crash_ind) {

	if (priv->early_crash_ind) {

		icnss_pr_dbg("PD Down ignored as early indication is processed: %d, state: 0x%lx\n",

		icnss_pr_dbg("PD Down ignored as early indication is processed: %d, state: 0x%lx\n",

			     event_data->crashed, priv->state);

			     event_data->crashed, priv->state);
@@ -1117,9 +1120,6 @@ static int icnss_driver_event_pd_service_down(struct icnss_priv *priv, 
		goto out;

		goto out;

	}

	}





	if (priv->force_err_fatal)

		ICNSS_ASSERT(0);



	icnss_fw_crashed(priv, event_data);

	icnss_fw_crashed(priv, event_data);





out:

out: