diff --git a/[refs] b/[refs] index 5bc2abf8301f..139c9c634369 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 387fb6a206749e13377ef8847f77d5341c281e7b +refs/heads/master: 80060ecc45bd101f3decafed5b7ff0879a188d28 diff --git a/trunk/sound/pci/oxygen/virtuoso.c b/trunk/sound/pci/oxygen/virtuoso.c index 53d7289f21c0..c7080d6b71c2 100644 --- a/trunk/sound/pci/oxygen/virtuoso.c +++ b/trunk/sound/pci/oxygen/virtuoso.c @@ -229,9 +229,10 @@ static void xonar_dx_init(struct oxygen *chip) data->ext_power_int_reg = OXYGEN_GPI_INTERRUPT_MASK; data->ext_power_bit = GPI_DX_EXT_POWER; - /* XXX the DACs' datasheets say fast mode is not allowed */ - oxygen_set_bits16(chip, OXYGEN_2WIRE_BUS_STATUS, - OXYGEN_2WIRE_SPEED_FAST); + oxygen_write16(chip, OXYGEN_2WIRE_BUS_STATUS, + OXYGEN_2WIRE_LENGTH_8 | + OXYGEN_2WIRE_INTERRUPT_MASK | + OXYGEN_2WIRE_SPEED_FAST); /* set CPEN (control port mode) and power down */ cs4398_write(chip, 8, CS4398_CPEN | CS4398_PDN);