Merge branch 'fix/oxygen' into for-linus

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

+2
+2
sound/pci/oxygen/virtuoso.c
··· 635 636 static void xonar_d1_resume(struct oxygen *chip) 637 { 638 cs43xx_init(chip); 639 xonar_enable_output(chip); 640 }
··· 635 636 static void xonar_d1_resume(struct oxygen *chip) 637 { 638 + oxygen_set_bits8(chip, OXYGEN_FUNCTION, OXYGEN_FUNCTION_RESET_CODEC); 639 + msleep(1); 640 cs43xx_init(chip); 641 xonar_enable_output(chip); 642 }