diff options
| author | anholt <anholt@FreeBSD.org> | 2004-06-11 03:26:59 +0000 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2004-06-11 03:26:59 +0000 |
| commit | be5dc242b6a2d2549e38e77baf82adb7b33b042b (patch) | |
| tree | dc68be4b837d82c81a81bb2cec14ded275766e76 /sys/dev/drm/radeon_mem.c | |
| parent | da6e1707d47446b0f3de71fd5a924233a2168f65 (diff) | |
| download | FreeBSD-src-be5dc242b6a2d2549e38e77baf82adb7b33b042b.zip FreeBSD-src-be5dc242b6a2d2549e38e77baf82adb7b33b042b.tar.gz | |
Merge from DRI CVS as of 2004-05-26. Most of the meat is new PCI IDs and a new
packet for Radeon.
Diffstat (limited to 'sys/dev/drm/radeon_mem.c')
| -rw-r--r-- | sys/dev/drm/radeon_mem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/drm/radeon_mem.c b/sys/dev/drm/radeon_mem.c index ed72dd6..3238c27 100644 --- a/sys/dev/drm/radeon_mem.c +++ b/sys/dev/drm/radeon_mem.c @@ -141,12 +141,12 @@ static int init_heap(struct mem_block **heap, int start, int size) struct mem_block *blocks = DRM_MALLOC(sizeof(*blocks)); if (!blocks) - return -ENOMEM; + return DRM_ERR(ENOMEM); *heap = DRM_MALLOC(sizeof(**heap)); if (!*heap) { DRM_FREE( blocks, sizeof(*blocks) ); - return -ENOMEM; + return DRM_ERR(ENOMEM); } blocks->start = start; |
