diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-07-10 17:11:17 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-07-10 17:11:17 +0200 |
commit | 08fb98f5bf95cef902fc30427b39617a6f6875c7 (patch) | |
tree | d709cdc500b447bb957fd1e7fbc9073005b8ce8e /drivers/gpu/drm/amd/amdgpu/tonga_dpm.c | |
parent | 99aa22d0d8f70d9317727ab40c85b2ead740a6ca (diff) | |
parent | a017f583ec87d40b06eee6a6beeabe879c8113dd (diff) |
Merge branch 'linus' into x86/fpu, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/tonga_dpm.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/tonga_dpm.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/tonga_dpm.c b/drivers/gpu/drm/amd/amdgpu/tonga_dpm.c index b7615cefcac4..f06f6f4dc3a8 100644 --- a/drivers/gpu/drm/amd/amdgpu/tonga_dpm.c +++ b/drivers/gpu/drm/amd/amdgpu/tonga_dpm.c @@ -71,6 +71,11 @@ static int tonga_dpm_sw_init(void *handle) static int tonga_dpm_sw_fini(void *handle) { + struct amdgpu_device *adev = (struct amdgpu_device *)handle; + + release_firmware(adev->pm.fw); + adev->pm.fw = NULL; + return 0; } |