diff options
author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-03-12 10:18:33 +0000 |
---|---|---|
committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-03-12 10:18:33 +0000 |
commit | b6dc381fabb199e70dc681e44e31452af8536313 (patch) | |
tree | 9b25b1a427cba3d3e35d4272e53a482038142242 /linux-core/drm_fence.c | |
parent | 7f04dd06e6003dd492ae5ddc876121a686f49157 (diff) | |
parent | 2a618e5a7f6d26fe85e7d931d0ef08d9f18b1b7c (diff) |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Conflicts:
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
Diffstat (limited to 'linux-core/drm_fence.c')
-rw-r--r-- | linux-core/drm_fence.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linux-core/drm_fence.c b/linux-core/drm_fence.c index 9d80327f..0ca0c408 100644 --- a/linux-core/drm_fence.c +++ b/linux-core/drm_fence.c @@ -520,8 +520,10 @@ int drm_fence_object_create(struct drm_device *dev, uint32_t fence_class, struct drm_fence_manager *fm = &dev->fm; fence = drm_ctl_calloc(1, sizeof(*fence), DRM_MEM_FENCE); - if (!fence) + if (!fence) { + DRM_ERROR("Out of memory creating fence object\n"); return -ENOMEM; + } ret = drm_fence_object_init(dev, fence_class, type, flags, fence); if (ret) { drm_fence_usage_deref_unlocked(&fence); |