From 9836204e776ffd45257b6c24f97e1df7fc588a73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Fri, 26 Feb 2010 08:46:33 +0000 Subject: [PATCH] --- yaml --- r: 185635 b: refs/heads/master c: c8792d5e6cdfeb7db186f6ea654dee90ca3b9c0c h: refs/heads/master i: 185633: 65c63aa9f70ae600ee77296b4698f1a129f808b1 185631: 238b8c3045d181ae66eff634b6461a66273ee8f3 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/r600_audio.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 98b19ddfc8bb..b6c275accffd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 68de7745822f0dc2eea940e3c1fc65896d7afc88 +refs/heads/master: c8792d5e6cdfeb7db186f6ea654dee90ca3b9c0c diff --git a/trunk/drivers/gpu/drm/radeon/r600_audio.c b/trunk/drivers/gpu/drm/radeon/r600_audio.c index 387abaa275a4..668ff4b11c60 100644 --- a/trunk/drivers/gpu/drm/radeon/r600_audio.c +++ b/trunk/drivers/gpu/drm/radeon/r600_audio.c @@ -160,10 +160,10 @@ static void r600_audio_engine_enable(struct radeon_device *rdev, bool enable) */ int r600_audio_init(struct radeon_device *rdev) { - if (!r600_audio_chipset_supported(rdev)) + if (!radeon_audio || !r600_audio_chipset_supported(rdev)) return 0; - r600_audio_engine_enable(rdev, radeon_audio); + r600_audio_engine_enable(rdev, true); rdev->audio_channels = -1; rdev->audio_rate = -1; @@ -266,7 +266,7 @@ void r600_audio_set_clock(struct drm_encoder *encoder, int clock) */ void r600_audio_fini(struct radeon_device *rdev) { - if (!r600_audio_chipset_supported(rdev)) + if (!radeon_audio || !r600_audio_chipset_supported(rdev)) return; del_timer(&rdev->audio_timer);