diff options
| author |   Thomas Hellstrom <thellstrom@vmware.com> | 2010-11-09 21:31:44 +0100 |
|---|---|---|
| committer |   Dave Airlie <airlied@redhat.com> | 2010-11-10 11:52:19 +1000 |
| commit | 7dfbbdcffebc41441e64278961f57d2840a76259 (patch) | |
| tree | 5a536fdc99de855160409a33f5049ebb503c66de /drivers/gpu | |
| parent | drm/radeon/kms: Fix retrying ttm_bo_init() after it failed once. (diff) | |
| download | linux-dev-7dfbbdcffebc41441e64278961f57d2840a76259.tar.xz linux-dev-7dfbbdcffebc41441e64278961f57d2840a76259.zip | |
drm/ttm: Be consistent on ttm_bo_init() failures
Call destroy() on _all_ ttm_bo_init() failures, and make sure that
behavior is documented in the function description.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index ce464579c485..3ca77dc03915 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -1144,6 +1144,10 @@ int ttm_bo_init(struct ttm_bo_device *bdev, num_pages = (size + PAGE_SIZE - 1) >> PAGE_SHIFT; if (num_pages == 0) { printk(KERN_ERR TTM_PFX "Illegal buffer object size.\n"); + if (destroy) + (*destroy)(bo); + else + kfree(bo); return -EINVAL; } bo->destroy = destroy; |