diff options
Diffstat (limited to 'sound/pci/ice1712/ice1712.c')
| -rw-r--r-- | sound/pci/ice1712/ice1712.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index 5b442383fcd..58d7cda03de 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c | |||
| @@ -2688,12 +2688,13 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci, | |||
| 2688 | return err; | 2688 | return err; |
| 2689 | } | 2689 | } |
| 2690 | 2690 | ||
| 2691 | if (ice_has_con_ac97(ice)) | 2691 | if (ice_has_con_ac97(ice)) { |
| 2692 | err = snd_ice1712_pcm(ice, pcm_dev++, NULL); | 2692 | err = snd_ice1712_pcm(ice, pcm_dev++, NULL); |
| 2693 | if (err < 0) { | 2693 | if (err < 0) { |
| 2694 | snd_card_free(card); | 2694 | snd_card_free(card); |
| 2695 | return err; | 2695 | return err; |
| 2696 | } | 2696 | } |
| 2697 | } | ||
| 2697 | 2698 | ||
| 2698 | err = snd_ice1712_ac97_mixer(ice); | 2699 | err = snd_ice1712_ac97_mixer(ice); |
| 2699 | if (err < 0) { | 2700 | if (err < 0) { |
| @@ -2715,12 +2716,13 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci, | |||
| 2715 | } | 2716 | } |
| 2716 | } | 2717 | } |
| 2717 | 2718 | ||
| 2718 | if (ice_has_con_ac97(ice)) | 2719 | if (ice_has_con_ac97(ice)) { |
| 2719 | err = snd_ice1712_pcm_ds(ice, pcm_dev++, NULL); | 2720 | err = snd_ice1712_pcm_ds(ice, pcm_dev++, NULL); |
| 2720 | if (err < 0) { | 2721 | if (err < 0) { |
| 2721 | snd_card_free(card); | 2722 | snd_card_free(card); |
| 2722 | return err; | 2723 | return err; |
| 2723 | } | 2724 | } |
| 2725 | } | ||
| 2724 | 2726 | ||
| 2725 | if (!c->no_mpu401) { | 2727 | if (!c->no_mpu401) { |
| 2726 | err = snd_mpu401_uart_new(card, 0, MPU401_HW_ICE1712, | 2728 | err = snd_mpu401_uart_new(card, 0, MPU401_HW_ICE1712, |
