summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2009-07-02 08:31:30 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2009-07-30 16:06:01 -0700
commita40cc98181ba4a88ef00ba567fc4ae2cce5b6257 (patch)
treebdac9e74bea944f1030c1d89a9538be1c84babc6 /sound
parent2a1495a3933cb333301693b32311f0798e6d2607 (diff)
sound: virtuoso: fix Xonar D1/DX silence after resume
commit 826390796d09444b93e1f957582f8970ddfd9b3d upstream. When resuming, we better take the DACs out of the reset state before trying to use them. Reference: kernel bug #13599 http://bugzilla.kernel.org/show_bug.cgi?id=13599 Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/oxygen/virtuoso.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c
index 01d7b75f9182..d1773f650650 100644
--- a/sound/pci/oxygen/virtuoso.c
+++ b/sound/pci/oxygen/virtuoso.c
@@ -376,6 +376,8 @@ static void xonar_d2_resume(struct oxygen *chip)
static void xonar_d1_resume(struct oxygen *chip)
{
+ oxygen_set_bits8(chip, OXYGEN_FUNCTION, OXYGEN_FUNCTION_RESET_CODEC);
+ msleep(1);
cs43xx_init(chip);
xonar_enable_output(chip);
}