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

Commit e1ba2552 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "icnss: Do not assert if reboot requested during PDR"

parents 1cacd8a3 dc7b4aeb

drivers/soc/qcom/icnss.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -945,7 +945,7 @@ 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 (test_bit(ICNSS_PD_RESTART, &priv->state)) {

	if (test_bit(ICNSS_PD_RESTART, &priv->state) && event_data->crashed) {

		icnss_pr_err("PD Down while recovery inprogress, crashed: %d, state: 0x%lx\n",

		icnss_pr_err("PD Down while recovery inprogress, crashed: %d, state: 0x%lx\n",

			     event_data->crashed, priv->state);

			     event_data->crashed, priv->state);

		ICNSS_ASSERT(0);

		ICNSS_ASSERT(0);