From: Tom St Denis Date: Thu, 3 Mar 2016 14:20:10 +0000 (-0500) Subject: drm/amd/amdgpu: Don't proceed in audio_fini if disabled (DCEv10) X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=441ce96f14075f7c5e2995f07e7f037cc43c4a08;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git drm/amd/amdgpu: Don't proceed in audio_fini if disabled (DCEv10) If audio is disabled we shouldn't proceed into the fini function. Signed-off-by: Tom St Denis Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c index b8cb411918ab..199b95fff046 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c @@ -1668,6 +1668,9 @@ static void dce_v10_0_audio_fini(struct amdgpu_device *adev) { int i; + if (!amdgpu_audio) + return; + if (!adev->mode_info.audio.enabled) return;