From ef6bfe7e7e757cbc52485fef3b5efcf95ccfb323 Mon Sep 17 00:00:00 2001 From: Peter Senna Tschudin Date: Wed, 12 Sep 2012 15:06:41 +0000 Subject: [PATCH] --- yaml --- r: 329510 b: refs/heads/master c: 33cce6e9801f7d0184a636e9096a7cf7f8237ff9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 11346a2b8613..705cffb68870 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3184009c36da413724f283e3c7ac9cc60c623bc4 +refs/heads/master: 33cce6e9801f7d0184a636e9096a7cf7f8237ff9 diff --git a/trunk/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/trunk/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c index 4f9e548b2eec..969d76532088 100644 --- a/trunk/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c +++ b/trunk/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c @@ -1060,7 +1060,7 @@ int ttm_dma_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages) _manager = kzalloc(sizeof(*_manager), GFP_KERNEL); if (!_manager) - goto err_manager; + goto err; mutex_init(&_manager->lock); INIT_LIST_HEAD(&_manager->pools); @@ -1078,9 +1078,6 @@ int ttm_dma_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages) } ttm_dma_pool_mm_shrink_init(_manager); return 0; -err_manager: - kfree(_manager); - _manager = NULL; err: return ret; }