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

Commit 9cd07da8 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "icnss2: Avoid sending fw down uevent to wlan driver twice"

parents 8616e29d 00410da9

drivers/soc/qcom/icnss2/main.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -417,6 +417,7 @@ static irqreturn_t fw_crash_indication_handler(int irq, void *ctx) 
		icnss_ignore_fw_timeout(true);

		icnss_ignore_fw_timeout(true);





		if (test_bit(ICNSS_FW_READY, &priv->state)) {

		if (test_bit(ICNSS_FW_READY, &priv->state)) {

			clear_bit(ICNSS_FW_READY, &priv->state);

			fw_down_data.crashed = true;

			fw_down_data.crashed = true;

			icnss_call_driver_uevent(priv, ICNSS_UEVENT_FW_DOWN,

			icnss_call_driver_uevent(priv, ICNSS_UEVENT_FW_DOWN,

						 &fw_down_data);

						 &fw_down_data);
@@ -1508,6 +1509,7 @@ static int icnss_modem_notifier_nb(struct notifier_block *nb, 
		icnss_ignore_fw_timeout(true);

		icnss_ignore_fw_timeout(true);





		if (test_bit(ICNSS_FW_READY, &priv->state)) {

		if (test_bit(ICNSS_FW_READY, &priv->state)) {

			clear_bit(ICNSS_FW_READY, &priv->state);

			fw_down_data.crashed = !!notif->crashed;

			fw_down_data.crashed = !!notif->crashed;

			icnss_call_driver_uevent(priv,

			icnss_call_driver_uevent(priv,

						 ICNSS_UEVENT_FW_DOWN,

						 ICNSS_UEVENT_FW_DOWN,
@@ -1537,6 +1539,7 @@ static int icnss_modem_notifier_nb(struct notifier_block *nb, 




	fw_down_data.crashed = !!notif->crashed;

	fw_down_data.crashed = !!notif->crashed;

	if (test_bit(ICNSS_FW_READY, &priv->state)) {

	if (test_bit(ICNSS_FW_READY, &priv->state)) {

		clear_bit(ICNSS_FW_READY, &priv->state);

		fw_down_data.crashed = !!notif->crashed;

		fw_down_data.crashed = !!notif->crashed;

		icnss_call_driver_uevent(priv,

		icnss_call_driver_uevent(priv,

					 ICNSS_UEVENT_FW_DOWN,

					 ICNSS_UEVENT_FW_DOWN,
@@ -1665,6 +1668,7 @@ static int icnss_service_notifier_notify(struct notifier_block *nb, 
		icnss_ignore_fw_timeout(true);

		icnss_ignore_fw_timeout(true);





		if (test_bit(ICNSS_FW_READY, &priv->state)) {

		if (test_bit(ICNSS_FW_READY, &priv->state)) {

			clear_bit(ICNSS_FW_READY, &priv->state);

			fw_down_data.crashed = event_data->crashed;

			fw_down_data.crashed = event_data->crashed;

			icnss_call_driver_uevent(priv,

			icnss_call_driver_uevent(priv,

						 ICNSS_UEVENT_FW_DOWN,

						 ICNSS_UEVENT_FW_DOWN,