diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-06-14 12:14:34 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-06-14 12:14:34 +0300 |
commit | 3559ff9650224a4af6b777a5df786f521f66db5a (patch) | |
tree | ff1d9ec0e27ab4b452f1d8b12485d21102900597 /drivers/gpu/drm/amd/amdgpu/fiji_dpm.c | |
parent | 70e0d117f2502f19517be03a64b3c513f31b3cdb (diff) | |
parent | db06d759d6cf903aeda8c107fd3abd366dd80200 (diff) | |
download | linux-3559ff9650224a4af6b777a5df786f521f66db5a.tar.xz |
Merge branch 'linus' into perf/core, to pick up fixes before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/fiji_dpm.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/fiji_dpm.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/fiji_dpm.c b/drivers/gpu/drm/amd/amdgpu/fiji_dpm.c index 245cabf06575..ed03b75175d4 100644 --- a/drivers/gpu/drm/amd/amdgpu/fiji_dpm.c +++ b/drivers/gpu/drm/amd/amdgpu/fiji_dpm.c @@ -72,6 +72,11 @@ static int fiji_dpm_sw_init(void *handle) static int fiji_dpm_sw_fini(void *handle) { + struct amdgpu_device *adev = (struct amdgpu_device *)handle; + + release_firmware(adev->pm.fw); + adev->pm.fw = NULL; + return 0; } |