From 74e1a11d840b3d7411b380c2e4e4c99126ea32a5 Mon Sep 17 00:00:00 2001 From: Seema Khowala Date: Mon, 16 Jul 2018 12:29:27 -0700 Subject: gpu: nvgpu: nvlink: remove device only if it is present nvlink can be disabled via DT. Check if nvlink device is present before calling nvlink specific functions to remove the device during shutdown. Change-Id: I33480425e2991c008f02dac989b56f21a54aa902 Signed-off-by: Seema Khowala Reviewed-on: https://git-master.nvidia.com/r/1779381 Reviewed-by: svc-mobile-coverity GVS: Gerrit_Virtual_Submit Reviewed-by: Vijayakumar Subbu Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/nvlink.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'drivers/gpu/nvgpu/common/nvlink.c') 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); -- cgit v1.2.2