[PATCH 2/3] drm/amd/amdgpu: Clean up memory leak in cz_dpm_init().

[Tom.StDenis@xxxxxxx (StDenis, Tom)]

Patch #2 has a typo should be 'j' in the loop.


I'll resend that patch in a second.


Tom


________________________________
From: Tom St Denis <tstdenis82@xxxxxxxxx>
Sent: Thursday, August 25, 2016 13:10
To: amd-gfx at lists.freedesktop.org
Cc: StDenis, Tom
Subject: [PATCH 2/3] drm/amd/amdgpu: Clean up memory leak in cz_dpm_init().

If init fails free up any allocated memory.

Signed-off-by: Tom St Denis <tom.stdenis at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/cz_dpm.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/cz_dpm.c b/drivers/gpu/drm/amd/amdgpu/cz_dpm.c
index b06b95ce1350..d97604386766 100644
--- a/drivers/gpu/drm/amd/amdgpu/cz_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/cz_dpm.c
@@ -44,6 +44,7 @@

 static void cz_dpm_powergate_uvd(struct amdgpu_device *adev, bool gate);
 static void cz_dpm_powergate_vce(struct amdgpu_device *adev, bool gate);
+static void cz_dpm_fini(struct amdgpu_device *adev);

 static struct cz_ps *cz_get_ps(struct amdgpu_ps *rps)
 {
@@ -411,11 +412,11 @@ static int cz_dpm_init(struct amdgpu_device *adev)

         ret = amdgpu_get_platform_caps(adev);
         if (ret)
-               return ret;
+               goto err;

         ret = amdgpu_parse_extended_power_table(adev);
         if (ret)
-               return ret;
+               goto err;

         pi->sram_end = SMC_RAM_END;

@@ -469,23 +470,26 @@ static int cz_dpm_init(struct amdgpu_device *adev)

         ret = cz_parse_sys_info_table(adev);
         if (ret)
-               return ret;
+               goto err;

         cz_patch_voltage_values(adev);
         cz_construct_boot_state(adev);

         ret = cz_parse_power_table(adev);
         if (ret)
-               return ret;
+               goto err;

         ret = cz_process_firmware_header(adev);
         if (ret)
-               return ret;
+               goto err;

         pi->dpm_enabled = true;
         pi->uvd_dynamic_pg = false;

         return 0;
+err:
+       cz_dpm_fini(adev);
+       return ret;
 }

 static void cz_dpm_fini(struct amdgpu_device *adev)
--
2.9.2

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20160825/13f8ca5d/attachment.html>