From 90925a739ab80a93c6a325c12a61752c24339089 Mon Sep 17 00:00:00 2001 From: Konsta Holtta Date: Thu, 22 Mar 2018 18:25:05 +0200 Subject: gpu: nvgpu: check sema pool alloc failure properly nvgpu_semaphore_pool_alloc() returns an ERR_PTR instead of NULL which the caller checks on failure. Common code should not use ERR_PTRs though, so modify nvgpu_semaphore_pool_alloc() to return error code separately and fix nvgpu_init_sema_pool() to consider this. Jira NVGPU-513 Change-Id: I435c0d2794d226774ed4c6b3bcbdde1e741854d8 Signed-off-by: Konsta Holtta Reviewed-on: https://git-master.nvidia.com/r/1673458 Reviewed-by: svc-mobile-coverity Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Deepak Nibade Reviewed-by: Terje Bergstrom Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/mm/vm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/gpu/nvgpu/common/mm') diff --git a/drivers/gpu/nvgpu/common/mm/vm.c b/drivers/gpu/nvgpu/common/mm/vm.c index f57b1c9c..13fd641e 100644 --- a/drivers/gpu/nvgpu/common/mm/vm.c +++ b/drivers/gpu/nvgpu/common/mm/vm.c @@ -230,9 +230,9 @@ static int nvgpu_init_sema_pool(struct vm_gk20a *vm) if (!sema_sea) return -ENOMEM; - vm->sema_pool = nvgpu_semaphore_pool_alloc(sema_sea); - if (!vm->sema_pool) - return -ENOMEM; + err = nvgpu_semaphore_pool_alloc(sema_sea, &vm->sema_pool); + if (err) + return err; /* * Allocate a chunk of GPU VA space for mapping the semaphores. We will -- cgit v1.2.2