From: Oded Gabbay Date: Mon, 12 Jan 2015 20:34:21 +0000 (+0200) Subject: drm/amdkfd: Don't BUG on freeing GART sub-allocation X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9216ed294053be68a673754a0f8da88aa7fb7941;p=linux-beck.git drm/amdkfd: Don't BUG on freeing GART sub-allocation Instead of creating a BUG if trying to free a NULL GART sub-allocation object, just return 0 (success). This is done to mirror behavior of kfree. Signed-off-by: Oded Gabbay --- diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c index 24b37ffad5c6..a23ed2440080 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c @@ -511,7 +511,10 @@ int kfd_gtt_sa_free(struct kfd_dev *kfd, struct kfd_mem_obj *mem_obj) unsigned int bit; BUG_ON(!kfd); - BUG_ON(!mem_obj); + + /* Act like kfree when trying to free a NULL object */ + if (!mem_obj) + return 0; pr_debug("kfd: free mem_obj = %p, range_start = %d, range_end = %d\n", mem_obj, mem_obj->range_start, mem_obj->range_end);