[PATCH 02/16] drm/mgag200: Fix memleak in error path in mgag200_bo_create()

[Egbert Eich]

The allocated struct mgag200_bo was not freed in all error paths.
This patch consolidates error handling and fixes this.

Signed-off-by: Egbert Eich <eich at suse.de>
---
 drivers/gpu/drm/mgag200/mgag200_ttm.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/mgag200/mgag200_ttm.c 
b/drivers/gpu/drm/mgag200/mgag200_ttm.c
index 3acb2b0..6461fd2 100644
--- a/drivers/gpu/drm/mgag200/mgag200_ttm.c
+++ b/drivers/gpu/drm/mgag200/mgag200_ttm.c
@@ -316,10 +316,8 @@ int mgag200_bo_create(struct drm_device *dev, int size, 
int align,
                return -ENOMEM;

        ret = drm_gem_object_init(dev, &mgabo->gem, size);
-       if (ret) {
-               kfree(mgabo);
-               return ret;
-       }
+       if (ret)
+               goto err;

        mgabo->gem.driver_private = NULL;
        mgabo->bo.bdev = &mdev->ttm.bdev;
@@ -334,10 +332,13 @@ int mgag200_bo_create(struct drm_device *dev, int size, 
int align,
                          align >> PAGE_SHIFT, false, NULL, acc_size,
                          NULL, mgag200_bo_ttm_destroy);
        if (ret)
-               return ret;
+               goto err;

        *pmgabo = mgabo;
        return 0;
+err:
+       kfree(mgabo);
+       return ret;
 }

 static inline u64 mgag200_bo_gpu_offset(struct mgag200_bo *bo)
-- 
1.8.1.4