Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'fix/oxygen' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'fix/oxygen' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
sound: oxygen: handle cards with missing EEPROM
sound: oxygen: fix MCLK rate for 192 kHz playback
+5
+3
sound/pci/oxygen/oxygen_lib.c
+3
sound/pci/oxygen/oxygen_lib.c
···
260
260
* chip didn't if the first EEPROM word was overwritten.
261
261
*/
262
262
subdevice = oxygen_read_eeprom(chip, 2);
263
+
/* use default ID if EEPROM is missing */
264
+
if (subdevice == 0xffff)
265
+
subdevice = 0x8788;
263
266
/*
264
267
* We use only the subsystem device ID for searching because it is
265
268
* unique even without the subsystem vendor ID, which may have been
+2
sound/pci/oxygen/oxygen_pcm.c
+2
sound/pci/oxygen/oxygen_pcm.c
···
469
469
oxygen_write16_masked(chip, OXYGEN_I2S_MULTICH_FORMAT,
470
470
oxygen_rate(hw_params) |
471
471
chip->model.dac_i2s_format |
472
+
oxygen_i2s_mclk(hw_params) |
472
473
oxygen_i2s_bits(hw_params),
473
474
OXYGEN_I2S_RATE_MASK |
474
475
OXYGEN_I2S_FORMAT_MASK |
476
+
OXYGEN_I2S_MCLK_MASK |
475
477
OXYGEN_I2S_BITS_MASK);
476
478
oxygen_update_dac_routing(chip);
477
479
oxygen_update_spdif_source(chip);