sound (pci/oxygen) fixes
Subsystems (2)
Linus,
please pull sound driver fixes for v2.6.31-rc8 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git fix/oxygen
containing the following two (regression) fixes for PCI oxygen driver. Very local, thus pretty safe to apply.
Thanks!
Takashi
===
Clemens Ladisch (2):
sound: oxygen: fix MCLK rate for 192 kHz playback
sound: oxygen: handle cards with missing EEPROM
--- sound/pci/oxygen/oxygen_lib.c | 3 +++ sound/pci/oxygen/oxygen_pcm.c | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-)
sound/pci/oxygen/oxygen_lib.c +3 -0
@@ -260,6 +260,9 @@ oxygen_search_pci_id(struct oxygen *chip, const struct pci_device_id ids[])* chip didn't if the first EEPROM word was overwritten. */ subdevice =oxygen_read_eeprom (chip,2 ); +/* use default ID if EEPROM is missing */ +if (subdevice ==0xffff ) + subdevice =0x8788 ;/* * We use only the subsystem device ID for searching because it is * unique even without the subsystem vendor ID, which may have been
sound/pci/oxygen/oxygen_pcm.c +2 -0
@@ -469,9 +469,11 @@ static int oxygen_multich_hw_params(struct snd_pcm_substream *substream,oxygen_write16_masked (chip,OXYGEN_I2S_MULTICH_FORMAT ,oxygen_rate (hw_params) | chip->model.dac_i2s_format | +oxygen_i2s_mclk (hw_params) |oxygen_i2s_bits (hw_params),OXYGEN_I2S_RATE_MASK |OXYGEN_I2S_FORMAT_MASK | +OXYGEN_I2S_MCLK_MASK |OXYGEN_I2S_BITS_MASK );oxygen_update_dac_routing (chip);oxygen_update_spdif_source (chip);