Merge branch 'fix/oxygen' into for-linus

* fix/oxygen: sound: virtuoso: fix Xonar D1/DX silence after resume

Merge branch 'fix/oxygen' into for-linus
* fix/oxygen: sound: virtuoso: fix Xonar D1/DX silence after resume
dbe45d0c · Takashi Iwai · 4413c8d2 · 82639079 · dbe45d0c
Commit dbe45d0c authored Jul 02, 2009 by Takashi Iwai
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

sound/pci/oxygen/virtuoso.c sound/pci/oxygen/virtuoso.c +2 -0

No files found.
--- 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);
 }