| commit | dbe45d0ce394732cc06187e929697fc0fb16aa53 | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Thu Jul 02 17:48:34 2009 +0200 |
| committer | Takashi Iwai <tiwai@suse.de> | Thu Jul 02 17:48:34 2009 +0200 |
| tree | f1d51e0fc97e551eee8d779b4f0e341f4852e3d7 | |
| parent | 4413c8d2be530d7310feaceaae28350b316b2068 [diff] | |
| parent | 826390796d09444b93e1f957582f8970ddfd9b3d [diff] |
Merge branch 'fix/oxygen' into for-linus * fix/oxygen: sound: virtuoso: fix Xonar D1/DX silence after resume
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c index bf971f7..6ebcb6b 100644 --- a/sound/pci/oxygen/virtuoso.c +++ b/sound/pci/oxygen/virtuoso.c
@@ -635,6 +635,8 @@ 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); }