Merge "icnss2: Do not start recovery timer on gracefull shutdown" (8a2c8ccf) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/soc/qcom/icnss2/main.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -1860,6 +1860,7 @@ static int icnss_modem_notifier_nb(struct notifier_block *nb,
		icnss_driver_event_post(priv, ICNSS_DRIVER_EVENT_PD_SERVICE_DOWN,
		ICNSS_EVENT_SYNC, event_data);

		if (notif->crashed)
		mod_timer(&priv->recovery_timer,
		jiffies + msecs_to_jiffies(ICNSS_RECOVERY_TIMEOUT));
		out:
		@@ -2031,6 +2032,7 @@ static int icnss_service_notifier_notify(struct notifier_block *nb,
		icnss_driver_event_post(priv, ICNSS_DRIVER_EVENT_PD_SERVICE_DOWN,
		ICNSS_EVENT_SYNC, event_data);

		if (event_data->crashed)
		mod_timer(&priv->recovery_timer,
		jiffies + msecs_to_jiffies(ICNSS_RECOVERY_TIMEOUT));
		done: