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

Commit 2a6d117a authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: Propagate separate error code for PDR disabled" into msm-4.9

parents 33152025 4f27f59f

drivers/soc/qcom/service-notifier.c

+7 −1
Original line number Diff line number Diff line
@@ -635,7 +635,13 @@ static int send_pd_restart_req(const char *service_path, 
		return rc;

	}



	/* Check the response */

	/* Check response if PDR is disabled */

	if (QMI_RESP_BIT_SHIFT(resp.resp.result) == QMI_ERR_DISABLED_V01) {

		pr_err("PD restart is disabled 0x%x\n",

					QMI_RESP_BIT_SHIFT(resp.resp.error));

		return -EOPNOTSUPP;

	}

	/* Check the response for other error case*/

	if (QMI_RESP_BIT_SHIFT(resp.resp.result) != QMI_RESULT_SUCCESS_V01) {

		pr_err("QMI request for PD restart failed 0x%x\n",

					QMI_RESP_BIT_SHIFT(resp.resp.error));

include/soc/qcom/msm_qmi_interface.h

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-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
@@ -92,6 +92,7 @@ enum qmi_result_type_v01 { 
	QMI_RESULT_TYPE_MIN_ENUM_VAL_V01 = INT_MIN,

	QMI_RESULT_SUCCESS_V01 = 0,

	QMI_RESULT_FAILURE_V01 = 1,

	QMI_ERR_DISABLED_V01 = 0x45,

	QMI_RESULT_TYPE_MAX_ENUM_VAL_V01 = INT_MAX,

};