Merge "soc: qcom: service-notifier: fix object corruption" into msm-4.8 (fcc82891) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/soc/qcom/service-notifier.c

+5 −1

Original line number	Diff line number	Diff line
		/*
		* 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
		* it under the terms of the GNU General Public License version 2 and
		@@ -336,11 +336,13 @@ static void root_service_service_arrive(struct work_struct *work)
		int rc;
		int curr_state;

		mutex_lock(&qmi_client_release_lock);
		/* Create a Local client port for QMI communication */
		data->clnt_handle = qmi_handle_create(root_service_clnt_notify, work);
		if (!data->clnt_handle) {
		pr_err("QMI client handle alloc failed (instance-id: %d)\n",
		data->instance_id);
		mutex_unlock(&qmi_client_release_lock);
		return;
		}

		@@ -353,9 +355,11 @@ static void root_service_service_arrive(struct work_struct *work)
		data->instance_id, rc);
		qmi_handle_destroy(data->clnt_handle);
		data->clnt_handle = NULL;
		mutex_unlock(&qmi_client_release_lock);
		return;
		}
		data->service_connected = true;
		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 */