diff options
author | Dave Airlie <airlied@redhat.com> | 2009-12-07 18:25:45 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-12-07 18:25:45 -0500 |
commit | 447aeb907e417e0e837b4a4026d5081c88b6e8ca (patch) | |
tree | 40b9f4fc3f8b1149d0b22dd06aee818721b27de2 /drivers/gpu/drm/ttm | |
parent | ab2c0672984f7f7ebec6d5f615fd5a6ebad26f3d (diff) |
drm/ttm: fix unreachable code.
None of the in-tree drivers use user objects yet so this wasn't hitting
us.
Stanse found unreachable code in ttm_bo_add_ttm:
http://decibel.fi.muni.cz/~xslaby/stanse/error.cgi?db=32&id=714#l238
Reported-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/ttm')
-rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 87c06252d464..e13fd23f3334 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/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) | |||
275 | bo->ttm = ttm_tt_create(bdev, bo->num_pages << PAGE_SHIFT, | 275 | bo->ttm = ttm_tt_create(bdev, bo->num_pages << PAGE_SHIFT, |
276 | page_flags | TTM_PAGE_FLAG_USER, | 276 | page_flags | TTM_PAGE_FLAG_USER, |
277 | glob->dummy_read_page); | 277 | glob->dummy_read_page); |
278 | if (unlikely(bo->ttm == NULL)) | 278 | if (unlikely(bo->ttm == NULL)) { |
279 | ret = -ENOMEM; | 279 | ret = -ENOMEM; |
280 | break; | 280 | break; |
281 | } | ||
281 | 282 | ||
282 | ret = ttm_tt_set_user(bo->ttm, current, | 283 | ret = ttm_tt_set_user(bo->ttm, current, |
283 | bo->buffer_start, bo->num_pages); | 284 | bo->buffer_start, bo->num_pages); |