Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 118066
b: refs/heads/master
c: 8cd2b26
h: refs/heads/master
v: v3
  • Loading branch information
Ilpo Järvinen authored and Takashi Iwai committed Oct 30, 2008
1 parent 592f349 commit 3dc84c5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e2736261b4c85e36f7c8a66dd082ec0751230460
refs/heads/master: 8cd2b264d92bb949ddccfb6db6a82254bb07af75
6 changes: 4 additions & 2 deletions trunk/sound/pci/ice1712/ice1712.c
Original file line number Diff line number Diff line change
Expand Up @@ -2688,12 +2688,13 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,
return err;
}

if (ice_has_con_ac97(ice))
if (ice_has_con_ac97(ice)) {
err = snd_ice1712_pcm(ice, pcm_dev++, NULL);
if (err < 0) {
snd_card_free(card);
return err;
}
}

err = snd_ice1712_ac97_mixer(ice);
if (err < 0) {
Expand All @@ -2715,12 +2716,13 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,
}
}

if (ice_has_con_ac97(ice))
if (ice_has_con_ac97(ice)) {
err = snd_ice1712_pcm_ds(ice, pcm_dev++, NULL);
if (err < 0) {
snd_card_free(card);
return err;
}
}

if (!c->no_mpu401) {
err = snd_mpu401_uart_new(card, 0, MPU401_HW_ICE1712,
Expand Down

0 comments on commit 3dc84c5

Please sign in to comment.