1 files changed, 5 insertions, 9 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 8c81b5b6..e8008937 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -182,15 +182,11 @@ int gk20a_finalize_poweron(struct gk20a *g)
         }
 
         if (nvgpu_is_enabled(g, NVGPU_SUPPORT_NVLINK)) {
-                if (g->ops.nvlink.init) {
-                        err = g->ops.nvlink.init(g);
-                        if (err) {
-                                nvgpu_err(g, "failed to init nvlink");
-                                __nvgpu_set_enabled(g, NVGPU_SUPPORT_NVLINK,
-                                                                        false);
-                        }
-                } else
-                        __nvgpu_set_enabled(g, NVGPU_SUPPORT_NVLINK, false);
+                err = g->ops.nvlink.init(g);
+                if (err) {
+                        nvgpu_err(g, "failed to init nvlink");
+                        goto done;
+                }
         }
 
         if (g->ops.fb.mem_unlock) {