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

Merge "soc: qcom: Notify clients in case qmi connection to service locator fails"

Browse source
This commit is contained in:
Linux Build Service Account 2017-02-27 23:37:22 -08:00 • committed by Gerrit - the friendly Code Review server
commit f3cef9d2d4
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/soc/qcom/service-locator.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved. * Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -111,6 +111,7 @@ static void service_locator_svc_arrive(struct work_struct *work)
qmi_handle_create(service_locator_clnt_notify, NULL); qmi_handle_create(service_locator_clnt_notify, NULL);
if (!service_locator.clnt_handle) { if (!service_locator.clnt_handle) {
service_locator.clnt_handle = NULL; service_locator.clnt_handle = NULL;
complete_all(&service_locator.service_available);
mutex_unlock(&service_locator.service_mutex); mutex_unlock(&service_locator.service_mutex);
pr_err("Service locator QMI client handle alloc failed!\n"); pr_err("Service locator QMI client handle alloc failed!\n");
return; return;
@ -123,6 +124,7 @@ static void service_locator_svc_arrive(struct work_struct *work)
if (rc) { if (rc) {
qmi_handle_destroy(service_locator.clnt_handle); qmi_handle_destroy(service_locator.clnt_handle);
service_locator.clnt_handle = NULL; service_locator.clnt_handle = NULL;
complete_all(&service_locator.service_available);
mutex_unlock(&service_locator.service_mutex); mutex_unlock(&service_locator.service_mutex);
pr_err("Unable to connnect to service rc:%d\n", rc); pr_err("Unable to connnect to service rc:%d\n", rc);
return; return;
@ -138,6 +140,7 @@ static void service_locator_svc_exit(struct work_struct *work)
mutex_lock(&service_locator.service_mutex); mutex_lock(&service_locator.service_mutex);
qmi_handle_destroy(service_locator.clnt_handle); qmi_handle_destroy(service_locator.clnt_handle);
service_locator.clnt_handle = NULL; service_locator.clnt_handle = NULL;
complete_all(&service_locator.service_available);
mutex_unlock(&service_locator.service_mutex); mutex_unlock(&service_locator.service_mutex);
pr_info("Connection with service locator lost\n"); pr_info("Connection with service locator lost\n");
} }