Merge branch 'ast-updates' of ssh://people.freedesktop.org/~/linux into drm-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / ast / ast_main.c

diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c
index 1124fb40758e51240e4a0577eba435f0172df5bd..a2cc6be97983fe327cd4f67a4c3204cd4985691c 100644 (file)
--- a/drivers/gpu/drm/ast/ast_main.c
+++ b/drivers/gpu/drm/ast/ast_main.c
@@ -485,16 +485,13 @@ static void ast_bo_unref(struct ast_bo **bo)
 
        tbo = &((*bo)->bo);
        ttm_bo_unref(&tbo);
-       if (tbo == NULL)
-               *bo = NULL;
-
+       *bo = NULL;
 }
+
 void ast_gem_free_object(struct drm_gem_object *obj)
 {
        struct ast_bo *ast_bo = gem_to_ast_bo(obj);
 
-       if (!ast_bo)
-               return;
        ast_bo_unref(&ast_bo);
 }