Merge remote branch 'korg/drm-radeon-testing' into drm-next-stage

[pandora-kernel.git] / drivers / gpu / drm / radeon / r600_audio.c

diff --git a/drivers/gpu/drm/radeon/r600_audio.c b/drivers/gpu/drm/radeon/r600_audio.c
index d7f6909..387abaa 100644 (file)
--- a/drivers/gpu/drm/radeon/r600_audio.c
+++ b/drivers/gpu/drm/radeon/r600_audio.c
@@ -270,6 +270,7 @@ void r600_audio_fini(struct radeon_device *rdev)
                return;
 
        del_timer(&rdev->audio_timer);
+       WREG32_P(R600_AUDIO_ENABLE, 0x0, ~0x81000000);
 
        r600_audio_engine_enable(rdev, false);
 }