From d38eb0e547c7604895a0638752733afc389cc7fd Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 8 Dec 2009 09:25:45 +1000 Subject: [PATCH] --- yaml --- r: 174511 b: refs/heads/master c: 447aeb907e417e0e837b4a4026d5081c88b6e8ca h: refs/heads/master i: 174509: 2bb593af161ddc03f3b6c7100b54eadc4fbfa040 174507: cf4eec0431258cc84109e2a07a28631454b068c7 174503: f9df54e0ac78ddcab596f54f8dcf63b1d19a2460 174495: 2e504e32aed855d4710e03b469d0b8b48c2725eb v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/ttm/ttm_bo.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4b19c88969fa..170901a72f2c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab2c0672984f7f7ebec6d5f615fd5a6ebad26f3d +refs/heads/master: 447aeb907e417e0e837b4a4026d5081c88b6e8ca diff --git a/trunk/drivers/gpu/drm/ttm/ttm_bo.c b/trunk/drivers/gpu/drm/ttm/ttm_bo.c index 87c06252d464..e13fd23f3334 100644 --- a/trunk/drivers/gpu/drm/ttm/ttm_bo.c +++ b/trunk/drivers/gpu/drm/ttm/ttm_bo.c @@ -275,9 +275,10 @@ static int ttm_bo_add_ttm(struct ttm_buffer_object *bo, bool zero_alloc) bo->ttm = ttm_tt_create(bdev, bo->num_pages << PAGE_SHIFT, page_flags | TTM_PAGE_FLAG_USER, glob->dummy_read_page); - if (unlikely(bo->ttm == NULL)) + if (unlikely(bo->ttm == NULL)) { ret = -ENOMEM; - break; + break; + } ret = ttm_tt_set_user(bo->ttm, current, bo->buffer_start, bo->num_pages);