slimbus: qcom-ngd-ctrl: disable ngd in qmi server down callback

Srinivas-Kandagatla · gregkh · commit 709ec3f7fc57 · 2020-09-25T14:41:51.000+02:00
In QMI new server notification we enable the NGD however during delete server notification we do not disable the NGD. This can lead to multiple instances of NGD being enabled, so make sure that we disable NGD in delete server callback to fix this issue! Fixes: 917809e ("slimbus: ngd: Add qcom SLIMBus NGD driver") Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Link: https://lore.kernel.org/r/20200925095520.27316-4-srinivas.kandagatla@linaro.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c
@@ -1277,9 +1277,13 @@ static void qcom_slim_ngd_qmi_del_server(struct qmi_handle *hdl,
 {
 	struct qcom_slim_ngd_qmi *qmi =
 		container_of(hdl, struct qcom_slim_ngd_qmi, svc_event_hdl);
+	struct qcom_slim_ngd_ctrl *ctrl =
+		container_of(qmi, struct qcom_slim_ngd_ctrl, qmi);
 
 	qmi->svc_info.sq_node = 0;
 	qmi->svc_info.sq_port = 0;
+
+	qcom_slim_ngd_enable(ctrl, false);
 }
 
 static struct qmi_ops qcom_slim_ngd_qmi_svc_event_ops = {

Original file line number	Diff line number	Diff line change
`@@ -1277,9 +1277,13 @@ static void qcom_slim_ngd_qmi_del_server(struct qmi_handle *hdl,`
`1277`	`1277`	`{`
`1278`	`1278`	`struct qcom_slim_ngd_qmi *qmi =`
`1279`	`1279`	`container_of(hdl, struct qcom_slim_ngd_qmi, svc_event_hdl);`
	`1280`	`+ struct qcom_slim_ngd_ctrl *ctrl =`
	`1281`	`+ container_of(qmi, struct qcom_slim_ngd_ctrl, qmi);`
`1280`	`1282`
`1281`	`1283`	`qmi->svc_info.sq_node = 0;`
`1282`	`1284`	`qmi->svc_info.sq_port = 0;`
	`1285`	`+`
	`1286`	`+ qcom_slim_ngd_enable(ctrl, false);`
`1283`	`1287`	`}`
`1284`	`1288`
`1285`	`1289`	`static struct qmi_ops qcom_slim_ngd_qmi_svc_event_ops = {`