1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/common/nvlink.c b/drivers/gpu/nvgpu/common/nvlink.c
index 1a6ee853..6bfc154c 100644
--- a/drivers/gpu/nvgpu/common/nvlink.c
+++ b/drivers/gpu/nvgpu/common/nvlink.c
@@ -510,7 +510,12 @@ int nvgpu_nvlink_remove(struct gk20a *g)
         struct nvlink_device *ndev;
         int err;
 
+        if (!nvgpu_is_enabled(g, NVGPU_SUPPORT_NVLINK))
+                return -ENODEV;
+
         ndev = g->nvlink.priv;
+        if(!ndev)
+                return -ENODEV;
 
         __nvgpu_set_enabled(g, NVGPU_SUPPORT_NVLINK, false);