drm/amdgpu: correct the return value for error case

It should not return 0 for error case as '0' is actually
a special value for index.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 13 insertions, 2 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
index 0b263a9857c6..8a8bc60cb6b4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
@@ -97,8 +97,19 @@ int amdgpu_xgmi_add_device(struct amdgpu_device *adev)
         if (!adev->gmc.xgmi.supported)
                 return 0;
 
-        adev->gmc.xgmi.node_id = psp_xgmi_get_node_id(&adev->psp);
-        adev->gmc.xgmi.hive_id = psp_xgmi_get_hive_id(&adev->psp);
+        ret = psp_xgmi_get_node_id(&adev->psp, &adev->gmc.xgmi.node_id);
+        if (ret) {
+                dev_err(adev->dev,
+                        "XGMI: Failed to get node id\n");
+                return ret;
+        }
+
+        ret = psp_xgmi_get_hive_id(&adev->psp, &adev->gmc.xgmi.hive_id);
+        if (ret) {
+                dev_err(adev->dev,
+                        "XGMI: Failed to get hive id\n");
+                return ret;
+        }
 
         mutex_lock(&xgmi_mutex);
         hive = amdgpu_get_xgmi_hive(adev);