Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b71b7dc0 authored Sep 05, 2009 by Linus Torvalds

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

parents 59430c2f 92653453

sound/pci/oxygen/oxygen_lib.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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.		* chip didn't if the first EEPROM word was overwritten.
	*/		*/
	subdevice = oxygen_read_eeprom(chip, 2);		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		* We use only the subsystem device ID for searching because it is
	* unique even without the subsystem vendor ID, which may have been		* unique even without the subsystem vendor ID, which may have been

sound/pci/oxygen/oxygen_pcm.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -469,9 +469,11 @@ static int oxygen_multich_hw_params(struct snd_pcm_substream *substream,
	oxygen_write16_masked(chip, OXYGEN_I2S_MULTICH_FORMAT,		oxygen_write16_masked(chip, OXYGEN_I2S_MULTICH_FORMAT,
	oxygen_rate(hw_params) \|		oxygen_rate(hw_params) \|
	chip->model.dac_i2s_format \|		chip->model.dac_i2s_format \|
			oxygen_i2s_mclk(hw_params) \|
	oxygen_i2s_bits(hw_params),		oxygen_i2s_bits(hw_params),
	OXYGEN_I2S_RATE_MASK \|		OXYGEN_I2S_RATE_MASK \|
	OXYGEN_I2S_FORMAT_MASK \|		OXYGEN_I2S_FORMAT_MASK \|
			OXYGEN_I2S_MCLK_MASK \|
	OXYGEN_I2S_BITS_MASK);		OXYGEN_I2S_BITS_MASK);
	oxygen_update_dac_routing(chip);		oxygen_update_dac_routing(chip);
	oxygen_update_spdif_source(chip);		oxygen_update_spdif_source(chip);