summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-07-02 17:48:34 +0200
committerTakashi Iwai <tiwai@suse.de>2009-07-02 17:48:34 +0200
commitdbe45d0ce394732cc06187e929697fc0fb16aa53 (patch)
treef1d51e0fc97e551eee8d779b4f0e341f4852e3d7 /sound
parent4413c8d2be530d7310feaceaae28350b316b2068 (diff)
parent826390796d09444b93e1f957582f8970ddfd9b3d (diff)
downloadlinux-dbe45d0ce394732cc06187e929697fc0fb16aa53.tar.gz
linux-dbe45d0ce394732cc06187e929697fc0fb16aa53.tar.bz2
linux-dbe45d0ce394732cc06187e929697fc0fb16aa53.zip
Merge branch 'fix/oxygen' into for-linus
* fix/oxygen: sound: virtuoso: fix Xonar D1/DX silence after resume
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 bf971f7cfdc6..6ebcb6bdd712 100644
--- a/sound/pci/oxygen/virtuoso.c
+++ b/sound/pci/oxygen/virtuoso.c
@@ -635,6 +635,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);
}