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

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

Merge "soc: qcom: Register for indication cb after obtaining state of remote pd"

parents 1d0a503d 635cd0dd

drivers/soc/qcom/peripheral-loader.c

+2 −2
Original line number Diff line number Diff line
@@ -917,13 +917,13 @@ out: 
						priv->region_start),

					VMID_HLOS);

			}

			if (desc->clear_fw_region && priv->region_start)

				pil_clear_segment(desc);

			dma_free_attrs(desc->dev, priv->region_size,

					priv->region, priv->region_start,

					&desc->attrs);

			priv->region = NULL;

		}

		if (desc->clear_fw_region && priv->region_start)

			pil_clear_segment(desc);

		pil_release_mmap(desc);

	}

	return ret;

drivers/soc/qcom/service-notifier.c

+6 −7
Original line number Diff line number Diff line
@@ -376,13 +376,6 @@ static void root_service_service_arrive(struct work_struct *work) 
	mutex_unlock(&qmi_client_release_lock);

	pr_info("Connection established between QMI handle and %d service\n",

							data->instance_id);

	/* Register for indication messages about service */

	rc = qmi_register_ind_cb(data->clnt_handle, root_service_service_ind_cb,

							(void *)data);

	if (rc < 0)

		pr_err("Indication callback register failed(instance-id: %d) rc:%d\n",

							data->instance_id, rc);



	mutex_lock(&notif_add_lock);

	mutex_lock(&service_list_lock);

	list_for_each_entry(service_notif, &service_list, list) {
@@ -405,6 +398,12 @@ static void root_service_service_arrive(struct work_struct *work) 
	}

	mutex_unlock(&service_list_lock);

	mutex_unlock(&notif_add_lock);

	/* Register for indication messages about service */

	rc = qmi_register_ind_cb(data->clnt_handle,

		root_service_service_ind_cb, (void *)data);

	if (rc < 0)

		pr_err("Indication callback register failed(instance-id: %d) rc:%d\n",

							data->instance_id, rc);

}



static void root_service_service_exit(struct qmi_client_info *data,