aboutsummaryrefslogtreecommitdiff
path: root/sound/pci/ice1712
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-11-07 09:06:05 +0100
committerTakashi Iwai <tiwai@suse.de>2008-11-07 09:06:05 +0100
commit63cf123bf5d538a066e4a899390c9ce56ab6df9f (patch)
tree00a5e6eabcfdd310247018188f8ebe35b8b6f1ba /sound/pci/ice1712
parent6834d7ce224a6f6a1dd05da3a867730c40943154 (diff)
parentfcef7836a31c6432b41a38867d413ed3d6aa8261 (diff)
Merge branch 'topic/fix/misc' into topic/misc
Diffstat (limited to 'sound/pci/ice1712')
-rw-r--r--sound/pci/ice1712/ice1712.c6
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,
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) {
@@ -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,