diff options
Diffstat (limited to 'sound/pci/oxygen/virtuoso.c')
-rw-r--r-- | sound/pci/oxygen/virtuoso.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c index bea34f10d447..83c2c43e7b85 100644 --- a/sound/pci/oxygen/virtuoso.c +++ b/sound/pci/oxygen/virtuoso.c | |||
@@ -102,10 +102,6 @@ static void xonar_init(struct oxygen *chip) | |||
102 | 102 | ||
103 | oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, 0x8c); | 103 | oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, 0x8c); |
104 | oxygen_write16_masked(chip, OXYGEN_GPIO_DATA, 0x00, 0x8c); | 104 | oxygen_write16_masked(chip, OXYGEN_GPIO_DATA, 0x00, 0x8c); |
105 | #if 0 | ||
106 | oxygen_clear_bits16(chip, OXYGEN_I2S_MULTICH_FORMAT, | ||
107 | OXYGEN_I2S_MAGIC1_MASK); | ||
108 | #endif | ||
109 | oxygen_ac97_set_bits(chip, 0, 0x62, 0x0080); | 105 | oxygen_ac97_set_bits(chip, 0, 0x62, 0x0080); |
110 | msleep(300); | 106 | msleep(300); |
111 | oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, 0x100); | 107 | oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, 0x100); |
@@ -253,6 +249,8 @@ static const struct oxygen_model model_xonar = { | |||
253 | OXYGEN_CHANNEL_SPDIF | | 249 | OXYGEN_CHANNEL_SPDIF | |
254 | OXYGEN_CHANNEL_MULTICH, | 250 | OXYGEN_CHANNEL_MULTICH, |
255 | .function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5, | 251 | .function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5, |
252 | .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, | ||
253 | .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, | ||
256 | }; | 254 | }; |
257 | 255 | ||
258 | static int __devinit xonar_probe(struct pci_dev *pci, | 256 | static int __devinit xonar_probe(struct pci_dev *pci, |