diff options
Diffstat (limited to 'sound/pci/ice1712/ice1712.c')
-rw-r--r-- | sound/pci/ice1712/ice1712.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index c56793b381e2..2821014b26e9 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c | |||
@@ -2743,8 +2743,14 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci, | |||
2743 | snd_card_free(card); | 2743 | snd_card_free(card); |
2744 | return err; | 2744 | return err; |
2745 | } | 2745 | } |
2746 | 2746 | if (c->mpu401_1_name) | |
2747 | if (ice->eeprom.data[ICE_EEP1_CODEC] & ICE1712_CFG_2xMPU401) | 2747 | /* Prefered name available in card_info */ |
2748 | snprintf(ice->rmidi[0]->name, | ||
2749 | sizeof(ice->rmidi[0]->name), | ||
2750 | "%s %d", c->mpu401_1_name, card->number); | ||
2751 | |||
2752 | if (ice->eeprom.data[ICE_EEP1_CODEC] & ICE1712_CFG_2xMPU401) { | ||
2753 | /* 2nd port used */ | ||
2748 | if ((err = snd_mpu401_uart_new(card, 1, MPU401_HW_ICE1712, | 2754 | if ((err = snd_mpu401_uart_new(card, 1, MPU401_HW_ICE1712, |
2749 | ICEREG(ice, MPU2_CTRL), 1, | 2755 | ICEREG(ice, MPU2_CTRL), 1, |
2750 | ice->irq, 0, | 2756 | ice->irq, 0, |
@@ -2752,6 +2758,13 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci, | |||
2752 | snd_card_free(card); | 2758 | snd_card_free(card); |
2753 | return err; | 2759 | return err; |
2754 | } | 2760 | } |
2761 | if (c->mpu401_2_name) | ||
2762 | /* Prefered name available in card_info */ | ||
2763 | snprintf(ice->rmidi[1]->name, | ||
2764 | sizeof(ice->rmidi[1]->name), | ||
2765 | "%s %d", c->mpu401_2_name, | ||
2766 | card->number); | ||
2767 | } | ||
2755 | } | 2768 | } |
2756 | 2769 | ||
2757 | snd_ice1712_set_input_clock_source(ice, 0); | 2770 | snd_ice1712_set_input_clock_source(ice, 0); |