These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpu / drm / mgag200 / mgag200_ttm.c

diff --git a/kernel/drivers/gpu/drm/mgag200/mgag200_ttm.c b/kernel/drivers/gpu/drm/mgag200/mgag200_ttm.c
index d16964e..05108b5 100644 (file)
--- a/kernel/drivers/gpu/drm/mgag200/mgag200_ttm.c
+++ b/kernel/drivers/gpu/drm/mgag200/mgag200_ttm.c
@@ -378,7 +378,7 @@ int mgag200_bo_pin(struct mgag200_bo *bo, u32 pl_flag, u64 *gpu_addr)
 
 int mgag200_bo_unpin(struct mgag200_bo *bo)
 {
-       int i, ret;
+       int i;
        if (!bo->pin_count) {
                DRM_ERROR("unpin bad %p\n", bo);
                return 0;
@@ -389,11 +389,7 @@ int mgag200_bo_unpin(struct mgag200_bo *bo)
 
        for (i = 0; i < bo->placement.num_placement ; i++)
                bo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT;
-       ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
-       if (ret)
-               return ret;
-
-       return 0;
+       return ttm_bo_validate(&bo->bo, &bo->placement, false, false);
 }
 
 int mgag200_bo_push_sysram(struct mgag200_bo *bo)