Merge branch 'fix/oxygen' into for-linus

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

sound/pci/oxygen/virtuoso.c

···
 
 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);
 }