drm: Branch 'master'

 amdgpu/amdgpu_cs.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 00aa2c18810efb896afd9ff0acbadd4aa9540fe6
Author: Edward O'Callaghan <[email protected]>
Date:   Sat Apr 22 16:47:40 2017 +1000

    amdgpu: Use the canonical form in branch predicate
    
    Suggested-by: Emil Velikov <[email protected]>
    Signed-off-by: Edward O'Callaghan <[email protected]>
    Reviewed-by: Emil Velikov <[email protected]>
    Reviewed-by: Nicolai Hähnle <[email protected]>

diff --git a/amdgpu/amdgpu_cs.c b/amdgpu/amdgpu_cs.c
index 0993a6d8..868eb7b0 100644
--- a/amdgpu/amdgpu_cs.c
+++ b/amdgpu/amdgpu_cs.c
@@ -559,7 +559,7 @@ int amdgpu_cs_wait_semaphore(amdgpu_context_handle ctx,
 	if (ring >= AMDGPU_CS_MAX_RINGS)
 		return -EINVAL;
 	/* must signal first */
-	if (NULL == sem->signal_fence.context)
+	if (!sem->signal_fence.context)
 		return -EINVAL;
 
 	pthread_mutex_lock(&ctx->sequence_mutex);

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot

--
_______________________________________________
Dri-patches mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dri-patches