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

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

Merge "icnss: Check driver state before sending uevent in PD notifier"

parents b6259335 6c993445

drivers/soc/qcom/icnss.c

+10 −1
Original line number Original line Diff line number Diff line
@@ -219,6 +219,12 @@ static int icnss_assign_msa_perm_all(struct icnss_priv *priv, 
	int i;

	int i;

	enum icnss_msa_perm old_perm;

	enum icnss_msa_perm old_perm;





	if (priv->nr_mem_region > WLFW_MAX_NUM_MEMORY_REGIONS) {

		icnss_pr_err("Invalid memory region len %d\n",

			     priv->nr_mem_region);

		return -EINVAL;

	}



	for (i = 0; i < priv->nr_mem_region; i++) {

	for (i = 0; i < priv->nr_mem_region; i++) {

		old_perm = priv->mem_region[i].perm;

		old_perm = priv->mem_region[i].perm;

		ret = icnss_assign_msa_perm(&priv->mem_region[i], new_perm);

		ret = icnss_assign_msa_perm(&priv->mem_region[i], new_perm);
@@ -1214,7 +1220,10 @@ static int icnss_service_notifier_notify(struct notifier_block *nb, 
	clear_bit(ICNSS_HOST_TRIGGERED_PDR, &priv->state);

	clear_bit(ICNSS_HOST_TRIGGERED_PDR, &priv->state);





	fw_down_data.crashed = event_data->crashed;

	fw_down_data.crashed = event_data->crashed;

	icnss_call_driver_uevent(priv, ICNSS_UEVENT_FW_DOWN, &fw_down_data);

	if (test_bit(ICNSS_DRIVER_PROBED, &priv->state) &&

	      !test_bit(ICNSS_PD_RESTART, &priv->state))

		icnss_call_driver_uevent(priv, ICNSS_UEVENT_FW_DOWN,

					 &fw_down_data);

	icnss_driver_event_post(ICNSS_DRIVER_EVENT_PD_SERVICE_DOWN,

	icnss_driver_event_post(ICNSS_DRIVER_EVENT_PD_SERVICE_DOWN,

				ICNSS_EVENT_SYNC, event_data);

				ICNSS_EVENT_SYNC, event_data);

done:

done: