diff options
author | Takashi Iwai <tiwai@suse.de> | 2006-05-23 07:24:30 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-06-22 15:33:56 -0400 |
commit | 302e4c2f9e2b9f07c69649782330a61c60001ac4 (patch) | |
tree | 406d44e355f502ac5e7ee584a28d725c6e7c8a94 /sound/pci/ice1712 | |
parent | 140432fd2fbe68d59fe6fcddbcd4bcd0f84e951a (diff) |
[ALSA] Change an arugment of snd_mpu401_uart_new() to bit flags
Change the 5th argument of snd_mpu401_uart_new() to bit flags
instead of a boolean. The argument takes bits that consist of
MPU401_INFO_XXX flags.
The callers that used the value 1 there are replaced with
MPU401_INFO_INTEGRATED.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ice1712')
-rw-r--r-- | sound/pci/ice1712/ice1712.c | 6 | ||||
-rw-r--r-- | sound/pci/ice1712/ice1724.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index 52de85e21b95..00e565e1db3a 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c | |||
@@ -2737,7 +2737,8 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci, | |||
2737 | 2737 | ||
2738 | if (! c->no_mpu401) { | 2738 | if (! c->no_mpu401) { |
2739 | if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_ICE1712, | 2739 | if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_ICE1712, |
2740 | ICEREG(ice, MPU1_CTRL), 1, | 2740 | ICEREG(ice, MPU1_CTRL), |
2741 | MPU401_INFO_INTEGRATED, | ||
2741 | ice->irq, 0, | 2742 | ice->irq, 0, |
2742 | &ice->rmidi[0])) < 0) { | 2743 | &ice->rmidi[0])) < 0) { |
2743 | snd_card_free(card); | 2744 | snd_card_free(card); |
@@ -2752,7 +2753,8 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci, | |||
2752 | if (ice->eeprom.data[ICE_EEP1_CODEC] & ICE1712_CFG_2xMPU401) { | 2753 | if (ice->eeprom.data[ICE_EEP1_CODEC] & ICE1712_CFG_2xMPU401) { |
2753 | /* 2nd port used */ | 2754 | /* 2nd port used */ |
2754 | if ((err = snd_mpu401_uart_new(card, 1, MPU401_HW_ICE1712, | 2755 | if ((err = snd_mpu401_uart_new(card, 1, MPU401_HW_ICE1712, |
2755 | ICEREG(ice, MPU2_CTRL), 1, | 2756 | ICEREG(ice, MPU2_CTRL), |
2757 | MPU401_INFO_INTEGRATED, | ||
2756 | ice->irq, 0, | 2758 | ice->irq, 0, |
2757 | &ice->rmidi[1])) < 0) { | 2759 | &ice->rmidi[1])) < 0) { |
2758 | snd_card_free(card); | 2760 | snd_card_free(card); |
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index 1031bcbf7064..34a58c629f47 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c | |||
@@ -2388,7 +2388,8 @@ static int __devinit snd_vt1724_probe(struct pci_dev *pci, | |||
2388 | if (! c->no_mpu401) { | 2388 | if (! c->no_mpu401) { |
2389 | if (ice->eeprom.data[ICE_EEP2_SYSCONF] & VT1724_CFG_MPU401) { | 2389 | if (ice->eeprom.data[ICE_EEP2_SYSCONF] & VT1724_CFG_MPU401) { |
2390 | if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_ICE1712, | 2390 | if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_ICE1712, |
2391 | ICEREG1724(ice, MPU_CTRL), 1, | 2391 | ICEREG1724(ice, MPU_CTRL), |
2392 | MPU401_INFO_INTEGRATED, | ||
2392 | ice->irq, 0, | 2393 | ice->irq, 0, |
2393 | &ice->rmidi[0])) < 0) { | 2394 | &ice->rmidi[0])) < 0) { |
2394 | snd_card_free(card); | 2395 | snd_card_free(card); |