1 files changed, 10 insertions, 3 deletions

diff --git a/drivers/gpu/nvgpu/gv100/nvlink_gv100.c b/drivers/gpu/nvgpu/gv100/nvlink_gv100.c
index b3e25c21..776d1d66 100644
--- a/drivers/gpu/nvgpu/gv100/nvlink_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/nvlink_gv100.c
@@ -1636,8 +1636,10 @@ int gv100_nvlink_init(struct gk20a *g)
                 return -ENODEV;
 
         err = nvgpu_nvlink_enumerate(g);
-        if (err)
-                return err;
+        if (err) {
+                nvgpu_err(g, "failed to enumerate nvlink");
+                goto fail;
+        }
 
         /* Set HSHUB and SG_PHY */
         __nvgpu_set_enabled(g, NVGPU_MM_USE_PHYSICAL_SG, true);
@@ -1645,10 +1647,15 @@ int gv100_nvlink_init(struct gk20a *g)
         err = g->ops.fb.enable_nvlink(g);
         if (err) {
                 nvgpu_err(g, "failed switch to nvlink sysmem");
-                return err;
+                goto fail;
         }
 
         return err;
+
+fail:
+        __nvgpu_set_enabled(g, NVGPU_MM_USE_PHYSICAL_SG, false);
+        __nvgpu_set_enabled(g, NVGPU_SUPPORT_NVLINK, false);
+        return err;
 }
 
 /*