From: Alex Deucher <[email protected]>

3.12-stable review patch.  If anyone has any objections, please let me know.

===============

commit d7eb0a0940618f36e5937d81c06ad7bf438a99e2 upstream.

Properly clear the enable bit when audio disable is requested.

Signed-off-by: Alex Deucher <[email protected]>
Reviewed-by: Christian König <[email protected]>
Signed-off-by: Jiri Slaby <[email protected]>
---
 drivers/gpu/drm/radeon/dce6_afmt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/radeon/dce6_afmt.c 
b/drivers/gpu/drm/radeon/dce6_afmt.c
index 86ee09783925..2a2879e53bd5 100644
--- a/drivers/gpu/drm/radeon/dce6_afmt.c
+++ b/drivers/gpu/drm/radeon/dce6_afmt.c
@@ -231,7 +231,7 @@ static void dce6_audio_enable(struct radeon_device *rdev,
                              bool enable)
 {
        WREG32_ENDPOINT(pin->offset, AZ_F0_CODEC_PIN_CONTROL_HOTPLUG_CONTROL,
-                       AUDIO_ENABLED);
+                       enable ? AUDIO_ENABLED : 0);
        DRM_INFO("%s audio %d support\n", enable ? "Enabling" : "Disabling", 
pin->id);
 }
 
-- 
1.9.0

--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to