ALSA: iec1712: Initialize STDSP24 properly when using the model=staudio option
The ST Audio ADCIII is an STDSP24 card plus extension box. With commite8a91ae18b
("ALSA: ice1712: Add support for STAudio ADCIII") we enabled the ADCIII ports using the model=staudio option but forgot this part to ensure the STDSP24 card is initialized properly. Fixes:e8a91ae18b
("ALSA: ice1712: Add support for STAudio ADCIII") Signed-off-by: Scott Bahling <sbahling@suse.com> Cc: <stable@vger.kernel.org> BugLink: https://bugzilla.suse.com/show_bug.cgi?id=1048934 Link: https://lore.kernel.org/r/20200518175728.28766-1-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
d9e8fe0cff
commit
b0cb099062
|
@ -2332,7 +2332,8 @@ static int snd_ice1712_chip_init(struct snd_ice1712 *ice)
|
||||||
pci_write_config_byte(ice->pci, 0x61, ice->eeprom.data[ICE_EEP1_ACLINK]);
|
pci_write_config_byte(ice->pci, 0x61, ice->eeprom.data[ICE_EEP1_ACLINK]);
|
||||||
pci_write_config_byte(ice->pci, 0x62, ice->eeprom.data[ICE_EEP1_I2SID]);
|
pci_write_config_byte(ice->pci, 0x62, ice->eeprom.data[ICE_EEP1_I2SID]);
|
||||||
pci_write_config_byte(ice->pci, 0x63, ice->eeprom.data[ICE_EEP1_SPDIF]);
|
pci_write_config_byte(ice->pci, 0x63, ice->eeprom.data[ICE_EEP1_SPDIF]);
|
||||||
if (ice->eeprom.subvendor != ICE1712_SUBDEVICE_STDSP24) {
|
if (ice->eeprom.subvendor != ICE1712_SUBDEVICE_STDSP24 &&
|
||||||
|
ice->eeprom.subvendor != ICE1712_SUBDEVICE_STAUDIO_ADCIII) {
|
||||||
ice->gpio.write_mask = ice->eeprom.gpiomask;
|
ice->gpio.write_mask = ice->eeprom.gpiomask;
|
||||||
ice->gpio.direction = ice->eeprom.gpiodir;
|
ice->gpio.direction = ice->eeprom.gpiodir;
|
||||||
snd_ice1712_write(ice, ICE1712_IREG_GPIO_WRITE_MASK,
|
snd_ice1712_write(ice, ICE1712_IREG_GPIO_WRITE_MASK,
|
||||||
|
|
Loading…
Reference in New Issue