evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Linux Build Service Account 2017-04-28 11:12:25 -07:00 • committed by Gerrit - the friendly Code Review server
commit 2bc49ab366
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/soc/qcom/peripheral-loader.c
View file

@ -917,13 +917,13 @@ out:
priv->region_start), priv->region_start),
VMID_HLOS); VMID_HLOS);
} }
if (desc->clear_fw_region && priv->region_start)
pil_clear_segment(desc);
dma_free_attrs(desc->dev, priv->region_size, dma_free_attrs(desc->dev, priv->region_size,
priv->region, priv->region_start, priv->region, priv->region_start,
&desc->attrs); &desc->attrs);
priv->region = NULL; priv->region = NULL;
} }
if (desc->clear_fw_region && priv->region_start)
pil_clear_segment(desc);
pil_release_mmap(desc); pil_release_mmap(desc);
} }
return ret; return ret;

13
drivers/soc/qcom/service-notifier.c
View file

@ -376,13 +376,6 @@ static void root_service_service_arrive(struct work_struct *work)
mutex_unlock(&qmi_client_release_lock); mutex_unlock(&qmi_client_release_lock);
pr_info("Connection established between QMI handle and %d service\n", pr_info("Connection established between QMI handle and %d service\n",
data->instance_id); 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(&notif_add_lock);
mutex_lock(&service_list_lock); mutex_lock(&service_list_lock);
list_for_each_entry(service_notif, &service_list, list) { 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(&service_list_lock);
mutex_unlock(&notif_add_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, static void root_service_service_exit(struct qmi_client_info *data,