From f536ebe9fcccb97a4761b2a662802098d0c42a06 Mon Sep 17 00:00:00 2001
From: YangYi <yangyi31@motorola.com>
Date: Mon, 10 Oct 2022 16:39:27 +0800
Subject: [PATCH] Penang: fix for device suspend tests fail. [1/2]

Penang:
Fix for device suspend tests fail.
qcom cr number: 3243388, 3208991.

Change-Id: Idedf1825a3237cd85cf463ec459f6d5a31662c8d
Signed-off-by: YangYi <yangyi31@motorola.com>
Reviewed-on: https://gerrit.mot.com/2400062
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Yuchang Guo <guoyc1@lenovo.com>
Reviewed-by: Jiacheng Ou <oujc1@motorola.com>
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key
---
 net/qrtr/mhi.c | 2 +-
 net/qrtr/ns.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/qrtr/mhi.c b/net/qrtr/mhi.c
index c9377d28d890..ae9c3e0f3fc3 100644
--- a/net/qrtr/mhi.c
+++ b/net/qrtr/mhi.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved. */
+/* Copyright (c) 2018-2021, The Linux Foundation. All rights reserved. */
 
 #include <linux/module.h>
 #include <linux/skbuff.h>
diff --git a/net/qrtr/ns.c b/net/qrtr/ns.c
index 845f21c8e1d0..28516cdeffb4 100644
--- a/net/qrtr/ns.c
+++ b/net/qrtr/ns.c
@@ -104,7 +104,7 @@ unsigned int qrtr_get_service_id(unsigned int node_id, unsigned int port_id)
 	struct qrtr_node *node;
 	unsigned long index;
 
-	node = node_get(node_id);
+	node = xa_load(&nodes, node_id);
 	if (!node)
 		return 0;