From 3970c731be7ccbf0b021afc1c14a9b437c522a3f Mon Sep 17 00:00:00 2001 From: Daniel Kurtz Date: Wed, 2 Jan 2013 18:25:58 +0800 Subject: [PATCH] CHROMIUM: drm/exynos: gem: Combine duplicate error handling in gem_create MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The error handling for buffer creation is the same for both CONTIG and NONCONTIG, so refactor a bit. Signed-off-by: Daniel Kurtz BUG=chromium-os:37097 TEST=builds clean; sanity check boot on device Change-Id: I296198291f06fe3dda9b9989ea139badbba53004 Reviewed-on: https://gerrit.chromium.org/gerrit/40442 Reviewed-by: Stéphane Marchesin Commit-Queue: Daniel Kurtz Reviewed-by: Daniel Kurtz Tested-by: Daniel Kurtz --- drivers/gpu/drm/exynos/exynos_drm_gem.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c index ea50669988404..5de2d2d69323d 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c @@ -378,18 +378,13 @@ struct exynos_drm_gem_obj *exynos_drm_gem_create(struct drm_device *dev, * allocate all pages as desired size if user wants to allocate * physically non-continuous memory. */ - if (flags & EXYNOS_BO_NONCONTIG) { + if (flags & EXYNOS_BO_NONCONTIG) ret = exynos_drm_gem_get_pages(&exynos_gem_obj->base); - if (ret < 0) { - drm_gem_object_release(&exynos_gem_obj->base); - goto err_fini_buf; - } - } else { + else ret = exynos_drm_alloc_buf(dev, buf, flags); - if (ret < 0) { - drm_gem_object_release(&exynos_gem_obj->base); - goto err_fini_buf; - } + if (ret < 0) { + drm_gem_object_release(&exynos_gem_obj->base); + goto err_fini_buf; } return exynos_gem_obj; -- 2.39.5