diff options
| author | Dan Carpenter <error27@gmail.com> | 2009-11-28 12:30:32 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-12-04 09:03:33 +1000 |
| commit | 46a79fa08a9a890a12cf9ec3ce51800911a907bf (patch) | |
| tree | f3d992722fae66bfcd7a27239a3e3758bfcb6d60 | |
| parent | 1a95916f5465ad6c91398f17924949db7e0b5c36 (diff) | |
| download | op-kernel-dev-46a79fa08a9a890a12cf9ec3ce51800911a907bf.zip op-kernel-dev-46a79fa08a9a890a12cf9ec3ce51800911a907bf.tar.gz | |
drm/ttm: fix small memory leak in ttm_memory.c
I moved the allocation until after the check for (si->totalhigh == 0).
Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-By: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_memory.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c index 072c281a..336976e 100644 --- a/drivers/gpu/drm/ttm/ttm_memory.c +++ b/drivers/gpu/drm/ttm/ttm_memory.c @@ -274,16 +274,17 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob, static int ttm_mem_init_highmem_zone(struct ttm_mem_global *glob, const struct sysinfo *si) { - struct ttm_mem_zone *zone = kzalloc(sizeof(*zone), GFP_KERNEL); + struct ttm_mem_zone *zone; uint64_t mem; int ret; - if (unlikely(!zone)) - return -ENOMEM; - if (si->totalhigh == 0) return 0; + zone = kzalloc(sizeof(*zone), GFP_KERNEL); + if (unlikely(!zone)) + return -ENOMEM; + mem = si->totalram; mem *= si->mem_unit; |
